diff --git a/Ide/Resources/LgiIde.lr8 b/Ide/Resources/Resources2/LgiIde.lr8
rename from Ide/Resources/LgiIde.lr8
rename to Ide/Resources/Resources2/LgiIde.lr8
diff --git a/Ide/Resources/Script1.rc b/Ide/Resources/Resources2/Script1.rc
rename from Ide/Resources/Script1.rc
rename to Ide/Resources/Resources2/Script1.rc
diff --git a/Ide/Resources/cmds-16px.png b/Ide/Resources/Resources2/cmds-16px.png
rename from Ide/Resources/cmds-16px.png
rename to Ide/Resources/Resources2/cmds-16px.png
diff --git a/Ide/Resources/cmds-32px.png b/Ide/Resources/Resources2/cmds-32px.png
rename from Ide/Resources/cmds-32px.png
rename to Ide/Resources/Resources2/cmds-32px.png
diff --git a/Ide/Resources/icon.ico b/Ide/Resources/Resources2/icon.ico
rename from Ide/Resources/icon.ico
rename to Ide/Resources/Resources2/icon.ico
diff --git a/Ide/Resources/icon.svg b/Ide/Resources/Resources2/icon.svg
rename from Ide/Resources/icon.svg
rename to Ide/Resources/Resources2/icon.svg
diff --git a/Ide/Resources/icon128.png b/Ide/Resources/Resources2/icon128.png
rename from Ide/Resources/icon128.png
rename to Ide/Resources/Resources2/icon128.png
diff --git a/Ide/Resources/icon16.png b/Ide/Resources/Resources2/icon16.png
rename from Ide/Resources/icon16.png
rename to Ide/Resources/Resources2/icon16.png
diff --git a/Ide/Resources/icon32.png b/Ide/Resources/Resources2/icon32.png
rename from Ide/Resources/icon32.png
rename to Ide/Resources/Resources2/icon32.png
diff --git a/Ide/Resources/icon64.png b/Ide/Resources/Resources2/icon64.png
rename from Ide/Resources/icon64.png
rename to Ide/Resources/Resources2/icon64.png
diff --git a/Ide/Resources/icons.png b/Ide/Resources/Resources2/icons.png
rename from Ide/Resources/icons.png
rename to Ide/Resources/Resources2/icons.png
diff --git a/Ide/Resources/mac-icon.icns b/Ide/Resources/Resources2/mac-icon.icns
rename from Ide/Resources/mac-icon.icns
rename to Ide/Resources/Resources2/mac-icon.icns
diff --git a/Ide/Resources/resdefs.h b/Ide/Resources/Resources2/resdefs.h
rename from Ide/Resources/resdefs.h
rename to Ide/Resources/Resources2/resdefs.h
diff --git a/Ide/Resources/resource.h b/Ide/Resources/Resources2/resource.h
rename from Ide/Resources/resource.h
rename to Ide/Resources/Resources2/resource.h
diff --git a/Ide/Resources/tools.png b/Ide/Resources/Resources2/tools.png
rename from Ide/Resources/tools.png
rename to Ide/Resources/Resources2/tools.png
diff --git a/Ide/Makefile.haiku b/Ide/haiku/Makefile.haiku
rename from Ide/Makefile.haiku
rename to Ide/haiku/Makefile.haiku
diff --git a/Ide/buildHaiku.py b/Ide/haiku/buildHaiku.py
rename from Ide/buildHaiku.py
rename to Ide/haiku/buildHaiku.py
diff --git a/Ide/Makefile.linux b/Ide/linux/Makefile.linux
rename from Ide/Makefile.linux
rename to Ide/linux/Makefile.linux
diff --git a/Ide/MacCocoa/Info.plist b/Ide/mac/Info.plist
rename from Ide/MacCocoa/Info.plist
rename to Ide/mac/Info.plist
diff --git a/Ide/MacCocoa/LgiIde.entitlements b/Ide/mac/LgiIde.entitlements
rename from Ide/MacCocoa/LgiIde.entitlements
rename to Ide/mac/LgiIde.entitlements
diff --git a/Ide/MacCocoa/LgiIde.xcodeproj/project.pbxproj b/Ide/mac/LgiIde.xcodeproj/project.pbxproj
rename from Ide/MacCocoa/LgiIde.xcodeproj/project.pbxproj
rename to Ide/mac/LgiIde.xcodeproj/project.pbxproj
diff --git a/Ide/MacCocoa/LgiIde.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Ide/mac/LgiIde.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename from Ide/MacCocoa/LgiIde.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to Ide/mac/LgiIde.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Ide/MacCocoa/LgiIde.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Ide/mac/LgiIde.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename from Ide/MacCocoa/LgiIde.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to Ide/mac/LgiIde.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Ide/Code/AddFtpFile.cpp b/Ide/src/AddFtpFile.cpp
rename from Ide/Code/AddFtpFile.cpp
rename to Ide/src/AddFtpFile.cpp
diff --git a/Ide/Code/AddFtpFile.h b/Ide/src/AddFtpFile.h
rename from Ide/Code/AddFtpFile.h
rename to Ide/src/AddFtpFile.h
diff --git a/Ide/Code/DebugContext.cpp b/Ide/src/DebugContext.cpp
rename from Ide/Code/DebugContext.cpp
rename to Ide/src/DebugContext.cpp
diff --git a/Ide/Code/DebugContext.h b/Ide/src/DebugContext.h
rename from Ide/Code/DebugContext.h
rename to Ide/src/DebugContext.h
diff --git a/Ide/Code/Debugger.cpp b/Ide/src/Debugger.cpp
rename from Ide/Code/Debugger.cpp
rename to Ide/src/Debugger.cpp
diff --git a/Ide/Code/Debugger.h b/Ide/src/Debugger.h
rename from Ide/Code/Debugger.h
rename to Ide/src/Debugger.h
diff --git a/Ide/Code/DocEdit.cpp b/Ide/src/DocEdit.cpp
rename from Ide/Code/DocEdit.cpp
rename to Ide/src/DocEdit.cpp
diff --git a/Ide/Code/DocEdit.h b/Ide/src/DocEdit.h
rename from Ide/Code/DocEdit.h
rename to Ide/src/DocEdit.h
diff --git a/Ide/Code/DocEditStyling.cpp b/Ide/src/DocEditStyling.cpp
rename from Ide/Code/DocEditStyling.cpp
rename to Ide/src/DocEditStyling.cpp
diff --git a/Ide/Code/FindInFiles.cpp b/Ide/src/FindInFiles.cpp
rename from Ide/Code/FindInFiles.cpp
rename to Ide/src/FindInFiles.cpp
diff --git a/Ide/Code/FindInFiles.h b/Ide/src/FindInFiles.h
rename from Ide/Code/FindInFiles.h
rename to Ide/src/FindInFiles.h
diff --git a/Ide/Code/FindSymbol.cpp b/Ide/src/FindSymbol.cpp
rename from Ide/Code/FindSymbol.cpp
rename to Ide/src/FindSymbol.cpp
diff --git a/Ide/Code/FindSymbol.h b/Ide/src/FindSymbol.h
rename from Ide/Code/FindSymbol.h
rename to Ide/src/FindSymbol.h
diff --git a/Ide/Code/FtpFile.h b/Ide/src/FtpFile.h
rename from Ide/Code/FtpFile.h
rename to Ide/src/FtpFile.h
diff --git a/Ide/Code/FtpThread.cpp b/Ide/src/FtpThread.cpp
rename from Ide/Code/FtpThread.cpp
rename to Ide/src/FtpThread.cpp
diff --git a/Ide/Code/FtpThread.h b/Ide/src/FtpThread.h
rename from Ide/Code/FtpThread.h
rename to Ide/src/FtpThread.h
diff --git a/Ide/Code/Grammer.cpp b/Ide/src/Grammer.cpp
rename from Ide/Code/Grammer.cpp
rename to Ide/src/Grammer.cpp
diff --git a/Ide/Code/Grammer2.cpp b/Ide/src/Grammer2.cpp
rename from Ide/Code/Grammer2.cpp
rename to Ide/src/Grammer2.cpp
diff --git a/Ide/Code/History.cpp b/Ide/src/History.cpp
rename from Ide/Code/History.cpp
rename to Ide/src/History.cpp
diff --git a/Ide/Code/History.h b/Ide/src/History.h
rename from Ide/Code/History.h
rename to Ide/src/History.h
diff --git a/Ide/Code/IdeCommon.cpp b/Ide/src/IdeCommon.cpp
rename from Ide/Code/IdeCommon.cpp
rename to Ide/src/IdeCommon.cpp
diff --git a/Ide/Code/IdeDoc.cpp b/Ide/src/IdeDoc.cpp
rename from Ide/Code/IdeDoc.cpp
rename to Ide/src/IdeDoc.cpp
diff --git a/Ide/Code/IdeDoc.h b/Ide/src/IdeDoc.h
rename from Ide/Code/IdeDoc.h
rename to Ide/src/IdeDoc.h
diff --git a/Ide/Code/IdeDocPrivate.h b/Ide/src/IdeDocPrivate.h
rename from Ide/Code/IdeDocPrivate.h
rename to Ide/src/IdeDocPrivate.h
diff --git a/Ide/Code/IdeProject.cpp b/Ide/src/IdeProject.cpp
rename from Ide/Code/IdeProject.cpp
rename to Ide/src/IdeProject.cpp
diff --git a/Ide/Code/IdeProject.h b/Ide/src/IdeProject.h
rename from Ide/Code/IdeProject.h
rename to Ide/src/IdeProject.h
diff --git a/Ide/Code/IdeProjectSettings.cpp b/Ide/src/IdeProjectSettings.cpp
rename from Ide/Code/IdeProjectSettings.cpp
rename to Ide/src/IdeProjectSettings.cpp
diff --git a/Ide/Code/IdeProjectSettings.h b/Ide/src/IdeProjectSettings.h
rename from Ide/Code/IdeProjectSettings.h
rename to Ide/src/IdeProjectSettings.h
diff --git a/Ide/Code/JavascriptParser.cpp b/Ide/src/JavascriptParser.cpp
rename from Ide/Code/JavascriptParser.cpp
rename to Ide/src/JavascriptParser.cpp
diff --git a/Ide/Code/LgiIde.cpp b/Ide/src/LgiIde.cpp
rename from Ide/Code/LgiIde.cpp
rename to Ide/src/LgiIde.cpp
diff --git a/Ide/Code/LgiIde.h b/Ide/src/LgiIde.h
rename from Ide/Code/LgiIde.h
rename to Ide/src/LgiIde.h
diff --git a/Ide/Code/LgiUtils.cpp b/Ide/src/LgiUtils.cpp
rename from Ide/Code/LgiUtils.cpp
rename to Ide/src/LgiUtils.cpp
diff --git a/Ide/Code/MemDumpViewer.cpp b/Ide/src/MemDumpViewer.cpp
rename from Ide/Code/MemDumpViewer.cpp
rename to Ide/src/MemDumpViewer.cpp
diff --git a/Ide/Code/MissingFiles.cpp b/Ide/src/MissingFiles.cpp
rename from Ide/Code/MissingFiles.cpp
rename to Ide/src/MissingFiles.cpp
diff --git a/Ide/Code/NewProjectFromTemplate.cpp b/Ide/src/NewProjectFromTemplate.cpp
rename from Ide/Code/NewProjectFromTemplate.cpp
rename to Ide/src/NewProjectFromTemplate.cpp
diff --git a/Ide/Code/ParserCommon.h b/Ide/src/ParserCommon.h
rename from Ide/Code/ParserCommon.h
rename to Ide/src/ParserCommon.h
diff --git a/Ide/Code/ProjectNode.cpp b/Ide/src/ProjectNode.cpp
rename from Ide/Code/ProjectNode.cpp
rename to Ide/src/ProjectNode.cpp
diff --git a/Ide/Code/ProjectNode.h b/Ide/src/ProjectNode.h
rename from Ide/Code/ProjectNode.h
rename to Ide/src/ProjectNode.h
diff --git a/Ide/Code/PythonParser.cpp b/Ide/src/PythonParser.cpp
rename from Ide/Code/PythonParser.cpp
rename to Ide/src/PythonParser.cpp
diff --git a/Ide/Code/SimpleCppParser.cpp b/Ide/src/SimpleCppParser.cpp
rename from Ide/Code/SimpleCppParser.cpp
rename to Ide/src/SimpleCppParser.cpp
diff --git a/Ide/Code/SpaceTabConv.cpp b/Ide/src/SpaceTabConv.cpp
rename from Ide/Code/SpaceTabConv.cpp
rename to Ide/src/SpaceTabConv.cpp
diff --git a/Ide/Code/SpaceTabConv.h b/Ide/src/SpaceTabConv.h
rename from Ide/Code/SpaceTabConv.h
rename to Ide/src/SpaceTabConv.h
diff --git a/Ide/Code/SysCharSupport.cpp b/Ide/src/SysCharSupport.cpp
rename from Ide/Code/SysCharSupport.cpp
rename to Ide/src/SysCharSupport.cpp
diff --git a/Ide/Code/WebFldDlg.cpp b/Ide/src/WebFldDlg.cpp
rename from Ide/Code/WebFldDlg.cpp
rename to Ide/src/WebFldDlg.cpp
diff --git a/Ide/Code/WebFldDlg.h b/Ide/src/WebFldDlg.h
rename from Ide/Code/WebFldDlg.h
rename to Ide/src/WebFldDlg.h
diff --git a/Ide/Code/cpp.txt b/Ide/src/cpp.txt
rename from Ide/Code/cpp.txt
rename to Ide/src/cpp.txt
diff --git a/Ide/Code/levenshtein.c b/Ide/src/levenshtein.c
rename from Ide/Code/levenshtein.c
rename to Ide/src/levenshtein.c
diff --git a/Ide/Code/levenshtein.h b/Ide/src/levenshtein.h
rename from Ide/Code/levenshtein.h
rename to Ide/src/levenshtein.h
diff --git a/Ide/Code/lgiide.icns b/Ide/src/lgiide.icns
rename from Ide/Code/lgiide.icns
rename to Ide/src/lgiide.icns
diff --git a/Ide/LgiIde_vs2015.sln b/Ide/win/LgiIde_vs2015.sln
rename from Ide/LgiIde_vs2015.sln
rename to Ide/win/LgiIde_vs2015.sln
diff --git a/Ide/LgiIde_vs2015.vcxproj b/Ide/win/LgiIde_vs2015.vcxproj
rename from Ide/LgiIde_vs2015.vcxproj
rename to Ide/win/LgiIde_vs2015.vcxproj
diff --git a/Ide/LgiIde_vs2015.vcxproj.filters b/Ide/win/LgiIde_vs2015.vcxproj.filters
rename from Ide/LgiIde_vs2015.vcxproj.filters
rename to Ide/win/LgiIde_vs2015.vcxproj.filters
diff --git a/Ide/Makefile.cygwin b/Ide/win/Makefile.cygwin
rename from Ide/Makefile.cygwin
rename to Ide/win/Makefile.cygwin
diff --git a/Ide/Makefile.windows b/Ide/win/Makefile.windows
rename from Ide/Makefile.windows
rename to Ide/win/Makefile.windows