Merge remote-tracking branch 'j/develop'

.github/ISSUE_TEMPLATE.txt

@@ -9,7 +9,9 @@ Please include:
   6) the plugin format (VST2, VST3, AU, AAX, RTAS) - if applicable
   7) which DAW you observed the bug in - if applicable
 
-Make sure you have pulled the latest commits from the JUCE repo and re-compiled
-the Projucer before you submit your bug. If it's a major bug, which must be
-hot-fixed immediately, then we will also accept bug reports for tagged release
-versions.
+Make sure you have pulled the latest commits from the `develop` branch of the
+JUCE repo and have re-compiled the Projucer before you submit your bug. Often
+we have already fixed the issue but it hasn't yet been released on the `master`
+branch. If it's a major bug, which must be hot-fixed immediately, then we will
+also accept bug reports for tagged release versions.
+

examples/DSP module plugin demo/Source/PluginProcessor.cpp

@@ -137,7 +137,7 @@ void DspModulePluginDemoAudioProcessor::process (dsp::ProcessContextReplacing<fl
     // The fast tanh can be used instead of std::tanh to reduce the CPU load
     auto waveshaperIndex = waveshaperParam->getIndex();
 
-    if (isPositiveAndBelow (waveshaperIndex, (int) numWaveShapers) )
+    if (isPositiveAndBelow (waveshaperIndex, numWaveShapers) )
     {
         waveShapers[waveshaperIndex].process (waveshaperContext);
 

examples/Demo/Source/Demos/AudioSettingsDemo.cpp

@@ -118,7 +118,7 @@ private:
         diagnosticsBox.applyFontToAllText (diagnosticsBox.getFont());
     }
 
-    static String getListOfActiveBits (const BitArray& b)
+    static String getListOfActiveBits (const BigInteger& b)
     {
         StringArray bits;
 

examples/audio plugin host/Source/FilterIOConfiguration.cpp

@@ -312,7 +312,7 @@ private:
 
                     if (selectedNumChannels != bus->getLastEnabledLayout().size())
                     {
-                        if (isPositiveAndBelow (selectedNumChannels, (int) AudioChannelSet::maxChannelsOfNamedLayout)
+                        if (isPositiveAndBelow (selectedNumChannels, AudioChannelSet::maxChannelsOfNamedLayout)
                              && bus->setCurrentLayoutWithoutEnabling (bus->supportedLayoutWithChannels (selectedNumChannels)))
                         {
                             if (auto* config = owner.getConfig (! isInput))

extras/Projucer/Builds/LinuxMakefile/Makefile

@@ -66,52 +66,52 @@ ifeq ($(CONFIG),Release)
 endif
 
 OBJECTS_APP := \
-  $(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o \
   $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o \
   $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o \
-  $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o \
-  $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o \
   $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o \
   $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o \
-  $(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o \
-  $(JUCE_OBJDIR)/jucer_LicenseController_9abff0cf.o \
-  $(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o \
-  $(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o \
-  $(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o \
-  $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o \
-  $(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o \
-  $(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o \
-  $(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o \
-  $(JUCE_OBJDIR)/jucer_PaintElement_653460.o \
-  $(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o \
-  $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o \
-  $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o \
-  $(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o \
-  $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o \
-  $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o \
-  $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o \
-  $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o \
-  $(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o \
+  $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o \
+  $(JUCE_OBJDIR)/jucer_OpenDocumentManager_ba866622.o \
+  $(JUCE_OBJDIR)/jucer_SourceCodeEditor_55965985.o \
+  $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_d7e70242.o \
+  $(JUCE_OBJDIR)/jucer_ButtonDocument_b2cabdec.o \
+  $(JUCE_OBJDIR)/jucer_ComponentDocument_1d8c1063.o \
+  $(JUCE_OBJDIR)/jucer_ColouredElement_acb45c39.o \
+  $(JUCE_OBJDIR)/jucer_PaintElement_db652060.o \
+  $(JUCE_OBJDIR)/jucer_PaintElementPath_d1b280a5.o \
+  $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_4fc44b8d.o \
+  $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_5e028963.o \
+  $(JUCE_OBJDIR)/jucer_EditingPanelBase_28115dee.o \
+  $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_89371a26.o \
+  $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_43fd8744.o \
+  $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_83779cd7.o \
+  $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_237eee2.o \
+  $(JUCE_OBJDIR)/jucer_TestComponent_1a4179c4.o \
   $(JUCE_OBJDIR)/jucer_BinaryResources_e0f99b46.o \
   $(JUCE_OBJDIR)/jucer_ComponentLayout_6ea00129.o \
   $(JUCE_OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o \
   $(JUCE_OBJDIR)/jucer_JucerDocument_ff8afcc2.o \
   $(JUCE_OBJDIR)/jucer_ObjectTypes_4406f01c.o \
   $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o \
-  $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o \
+  $(JUCE_OBJDIR)/jucer_LicenseController_9abff0cf.o \
+  $(JUCE_OBJDIR)/jucer_CompileEngineClient_aee8c99c.o \
+  $(JUCE_OBJDIR)/jucer_CompileEngineServer_5d8914.o \
+  $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_19bb4bb3.o \
   $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o \
   $(JUCE_OBJDIR)/jucer_Project_c131864a.o \
-  $(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o \
-  $(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o \
-  $(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o \
-  $(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o \
-  $(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o \
-  $(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o \
-  $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o \
-  $(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o \
-  $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o \
-  $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o \
-  $(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o \
+  $(JUCE_OBJDIR)/jucer_ProjectExporter_cf377b25.o \
+  $(JUCE_OBJDIR)/jucer_ProjectSaver_4276639b.o \
+  $(JUCE_OBJDIR)/jucer_ResourceFile_74b61849.o \
+  $(JUCE_OBJDIR)/jucer_AppearanceSettings_fa5d736e.o \
+  $(JUCE_OBJDIR)/jucer_StoredSettings_c7168d2d.o \
+  $(JUCE_OBJDIR)/jucer_CodeHelpers_1e797672.o \
+  $(JUCE_OBJDIR)/jucer_FileHelpers_54f12f83.o \
+  $(JUCE_OBJDIR)/jucer_MiscUtilities_31fc8dd8.o \
+  $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_5d68c773.o \
+  $(JUCE_OBJDIR)/jucer_Icons_d02d18f1.o \
+  $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_9b9f2ff0.o \
+  $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_3b20291d.o \
+  $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_4e7dc07e.o \
   $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \
   $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
   $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
@@ -134,11 +134,6 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES)
 	-$(V_AT)mkdir -p $(JUCE_OUTDIR)
 	$(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 
-$(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp
-	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_AppearanceSettings.cpp"
-	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
-
 $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_AutoUpdater.cpp"
@@ -149,16 +144,6 @@ $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_Comm
 	@echo "Compiling jucer_CommandLine.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp
-	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_DocumentEditorComponent.cpp"
-	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
-
-$(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o: ../../Source/Application/jucer_DownloadCompileEngineThread.cpp
-	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_DownloadCompileEngineThread.cpp"
-	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
-
 $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_Main.cpp"
@@ -169,97 +154,87 @@ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainW
 	@echo "Compiling jucer_MainWindow.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp
+$(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o: ../../Source/CodeEditor/jucer_DocumentEditorComponent.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_OpenDocumentManager.cpp"
-	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
-
-$(JUCE_OBJDIR)/jucer_LicenseController_9abff0cf.o: ../../Source/Licenses/jucer_LicenseController.cpp
-	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_LicenseController.cpp"
-	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
-
-$(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp
-	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling projucer_CompileEngineClient.cpp"
+	@echo "Compiling jucer_DocumentEditorComponent.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp
+$(JUCE_OBJDIR)/jucer_OpenDocumentManager_ba866622.o: ../../Source/CodeEditor/jucer_OpenDocumentManager.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling projucer_CompileEngineServer.cpp"
+	@echo "Compiling jucer_OpenDocumentManager.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp
+$(JUCE_OBJDIR)/jucer_SourceCodeEditor_55965985.o: ../../Source/CodeEditor/jucer_SourceCodeEditor.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_SourceCodeEditor.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp
+$(JUCE_OBJDIR)/jucer_ComponentTypeHandler_d7e70242.o: ../../Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ComponentTypeHandler.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
+$(JUCE_OBJDIR)/jucer_ButtonDocument_b2cabdec.o: ../../Source/ComponentEditor/Documents/jucer_ButtonDocument.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ButtonDocument.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp
+$(JUCE_OBJDIR)/jucer_ComponentDocument_1d8c1063.o: ../../Source/ComponentEditor/Documents/jucer_ComponentDocument.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ComponentDocument.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp
+$(JUCE_OBJDIR)/jucer_ColouredElement_acb45c39.o: ../../Source/ComponentEditor/PaintElements/jucer_ColouredElement.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ColouredElement.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp
+$(JUCE_OBJDIR)/jucer_PaintElement_db652060.o: ../../Source/ComponentEditor/PaintElements/jucer_PaintElement.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_PaintElement.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp
+$(JUCE_OBJDIR)/jucer_PaintElementPath_d1b280a5.o: ../../Source/ComponentEditor/PaintElements/jucer_PaintElementPath.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_PaintElementPath.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp
+$(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_4fc44b8d.o: ../../Source/ComponentEditor/UI/jucer_ComponentLayoutEditor.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ComponentLayoutEditor.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp
+$(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_5e028963.o: ../../Source/ComponentEditor/UI/jucer_ComponentOverlayComponent.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ComponentOverlayComponent.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp
+$(JUCE_OBJDIR)/jucer_EditingPanelBase_28115dee.o: ../../Source/ComponentEditor/UI/jucer_EditingPanelBase.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_EditingPanelBase.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp
+$(JUCE_OBJDIR)/jucer_JucerDocumentEditor_89371a26.o: ../../Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_JucerDocumentEditor.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp
+$(JUCE_OBJDIR)/jucer_PaintRoutineEditor_43fd8744.o: ../../Source/ComponentEditor/UI/jucer_PaintRoutineEditor.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_PaintRoutineEditor.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp
+$(JUCE_OBJDIR)/jucer_PaintRoutinePanel_83779cd7.o: ../../Source/ComponentEditor/UI/jucer_PaintRoutinePanel.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_PaintRoutinePanel.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
+$(JUCE_OBJDIR)/jucer_ResourceEditorPanel_237eee2.o: ../../Source/ComponentEditor/UI/jucer_ResourceEditorPanel.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ResourceEditorPanel.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp
+$(JUCE_OBJDIR)/jucer_TestComponent_1a4179c4.o: ../../Source/ComponentEditor/UI/jucer_TestComponent.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_TestComponent.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
@@ -294,9 +269,24 @@ $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer
 	@echo "Compiling jucer_PaintRoutine.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp
+$(JUCE_OBJDIR)/jucer_LicenseController_9abff0cf.o: ../../Source/Licenses/jucer_LicenseController.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_DependencyPathPropertyComponent.cpp"
+	@echo "Compiling jucer_LicenseController.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
+$(JUCE_OBJDIR)/jucer_CompileEngineClient_aee8c99c.o: ../../Source/LiveBuildEngine/jucer_CompileEngineClient.cpp
+	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
+	@echo "Compiling jucer_CompileEngineClient.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
+$(JUCE_OBJDIR)/jucer_CompileEngineServer_5d8914.o: ../../Source/LiveBuildEngine/jucer_CompileEngineServer.cpp
+	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
+	@echo "Compiling jucer_CompileEngineServer.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
+$(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_19bb4bb3.o: ../../Source/LiveBuildEngine/jucer_DownloadCompileEngineThread.cpp
+	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
+	@echo "Compiling jucer_DownloadCompileEngineThread.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
 $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp
@@ -309,59 +299,69 @@ $(JUCE_OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp
 	@echo "Compiling jucer_Project.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp
+$(JUCE_OBJDIR)/jucer_ProjectExporter_cf377b25.o: ../../Source/ProjectSaving/jucer_ProjectExporter.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ProjectExporter.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp
+$(JUCE_OBJDIR)/jucer_ProjectSaver_4276639b.o: ../../Source/ProjectSaving/jucer_ProjectSaver.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ProjectSaver.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp
+$(JUCE_OBJDIR)/jucer_ResourceFile_74b61849.o: ../../Source/ProjectSaving/jucer_ResourceFile.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_ResourceFile.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp
+$(JUCE_OBJDIR)/jucer_AppearanceSettings_fa5d736e.o: ../../Source/Settings/jucer_AppearanceSettings.cpp
+	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
+	@echo "Compiling jucer_AppearanceSettings.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
+$(JUCE_OBJDIR)/jucer_StoredSettings_c7168d2d.o: ../../Source/Settings/jucer_StoredSettings.cpp
+	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
+	@echo "Compiling jucer_StoredSettings.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
+$(JUCE_OBJDIR)/jucer_CodeHelpers_1e797672.o: ../../Source/Utility/Helpers/jucer_CodeHelpers.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_CodeHelpers.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp
+$(JUCE_OBJDIR)/jucer_FileHelpers_54f12f83.o: ../../Source/Utility/Helpers/jucer_FileHelpers.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
 	@echo "Compiling jucer_FileHelpers.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp
+$(JUCE_OBJDIR)/jucer_MiscUtilities_31fc8dd8.o: ../../Source/Utility/Helpers/jucer_MiscUtilities.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_Icons.cpp"
+	@echo "Compiling jucer_MiscUtilities.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp
+$(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_5d68c773.o: ../../Source/Utility/UI/PropertyComponents/jucer_DependencyPathPropertyComponent.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_JucerTreeViewBase.cpp"
+	@echo "Compiling jucer_DependencyPathPropertyComponent.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp
+$(JUCE_OBJDIR)/jucer_Icons_d02d18f1.o: ../../Source/Utility/UI/jucer_Icons.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_MiscUtilities.cpp"
+	@echo "Compiling jucer_Icons.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp
+$(JUCE_OBJDIR)/jucer_JucerTreeViewBase_9b9f2ff0.o: ../../Source/Utility/UI/jucer_JucerTreeViewBase.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_ProjucerLookAndFeel.cpp"
+	@echo "Compiling jucer_JucerTreeViewBase.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp
+$(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_3b20291d.o: ../../Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_SlidingPanelComponent.cpp"
+	@echo "Compiling jucer_ProjucerLookAndFeel.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp
+$(JUCE_OBJDIR)/jucer_SlidingPanelComponent_4e7dc07e.o: ../../Source/Utility/UI/jucer_SlidingPanelComponent.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling jucer_StoredSettings.cpp"
+	@echo "Compiling jucer_SlidingPanelComponent.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
 $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp

extras/Projucer/Builds/MacOSX/Info-App.plist

@@ -21,7 +21,7 @@
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIconFile</key>
-    <string>Icon.icns</string>
+    <string></string>
     <key>CFBundleIdentifier</key>
     <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
     <key>CFBundleName</key>

extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj

@@ -101,6 +101,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -143,101 +144,102 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Application\jucer_AppearanceSettings.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Application.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_AutoUpdater.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DocumentEditorComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_OpenDocumentManager.cpp"/>
-    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.cpp"/>
-    <ClCompile Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_ProjectContentComponent.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectExporter.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectSaver.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ResourceFile.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_CodeHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_FileHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_Icons.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_JucerTreeViewBase.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_MiscUtilities.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_SlidingPanelComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainConsoleAppTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_SimpleWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
+    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.cpp"/>
+    <ClCompile Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
+    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ResourceFile.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_AppearanceSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_StoredSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_Icons.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1385,97 +1387,91 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_gui_extra.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Application\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalSearchPathsWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_SVGPathDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_TranslationToolWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_UTF8WindowComponent.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_Application.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_AutoUpdater.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandIDs.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandLine.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DocumentEditorComponent.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_FilePreviewComponent.h"/>
-    <ClInclude Include="..\..\Source\jucer_Headers.h"/>
+    <ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_OpenDocumentManager.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_BuildTabStatusComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClassDatabase.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClientServerMessages.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ComponentListComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CppHelpers.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_DiagnosticMessage.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_LiveCodeBuilderDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_MessageIDs.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ProjectBuildInfo.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_SourceCodeRange.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_LiveBuildCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComboBoxHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentNameProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GenericComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GroupComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_HyperlinkButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ImageButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_JucerComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_LabelHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_SliderHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TabbedComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextEditorHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ToggleButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TreeViewHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ViewportHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ElementSiblingComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_FillType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_GradientPointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ImageResourceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementEllipse.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementGroup.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementImage.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRoundedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementText.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_StrokeType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentBooleanProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentChoiceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentColourProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentTextProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FilePropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FontPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_JustificationProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_PositionPropertyBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerCommandIDs.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_RelativePositionedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_SnapGridPainter.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_InlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewInlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_ItemPreviewComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_LiveBuildCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComboBoxHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentNameProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GenericComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GroupComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_HyperlinkButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ImageButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_JucerComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_LabelHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_SliderHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TabbedComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextEditorHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ToggleButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TreeViewHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ViewportHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ElementSiblingComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_FillType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_GradientPointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ImageResourceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementEllipse.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementGroup.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementImage.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRoundedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementText.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_StrokeType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentBooleanProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentChoiceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentColourProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentTextProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FilePropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FontPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_JustificationProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_PositionPropertyBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerCommandIDs.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_RelativePositionedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_SnapGridPainter.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_BinaryResources.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.h"/>
@@ -1483,54 +1479,71 @@
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_UtilityFunctions.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Exporter.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Modules.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_HeaderComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ActivityListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_BuildTabStatusComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ComponentListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ErrorListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ActivityList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClassDatabase.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClientServerMessages.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CppHelpers.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DiagnosticMessage.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ErrorList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_LiveCodeBuilderDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_MessageIDs.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ProjectBuildInfo.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_SourceCodeRange.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ExporterTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_FileTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ModuleTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTreeItemBase.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TabComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TreeItemTypes.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ContentViewComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_FileGroupInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_HeaderComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ModulesInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Module.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ModulesPanel.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Project.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectContentComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTab.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Android.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_CodeBlocks.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Make.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_MSVC.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_XCode.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExporter.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectSaver.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ResourceFile.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_AboutWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ApplicationUsageDataWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_EditorColourSchemeWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FilePathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FloatingToolWindow.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_GlobalSearchPathsWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Icons.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_JucerTreeViewBase.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_MiscUtilities.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_PresetIDs.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_RelativePath.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SlidingPanelComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_StoredSettings.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SVGPathDataComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationToolComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_UTF8Component.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Android.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_StoredSettings.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_Colours.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_PresetIDs.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_RelativePath.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_TranslationHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_FilePathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_TextWithDefaultPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_IconButton.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_Icons.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_UserSettingsPopup.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewFileWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.h"/>
@@ -1546,14 +1559,6 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Array.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_ArrayAllocationBase.h"/>
@@ -1947,39 +1952,36 @@
     <ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Source\BinaryData\gradle\gradle-wrapper.jar"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew.bat"/>
-    <None Include="..\..\Source\BinaryData\gradle\LICENSE"/>
-    <None Include="..\..\Source\BinaryData\background_logo.svg"/>
-    <None Include="..\..\Source\BinaryData\background_tile.png"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradle-wrapper.jar"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew.bat"/>
+    <None Include="..\..\Source\BinaryData\Gradle\LICENSE"/>
+    <None Include="..\..\Source\BinaryData\Icons\background_logo.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_android.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_codeBlocks.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_linux.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_visualStudio.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_xcode.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\huckleberry_icon.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce-logo-with-text.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce_icon.png"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AnimatedApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioPlugin.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_ConsoleApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_DLL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_GUI.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Highlight.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Openfile.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_OpenGL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
     <None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
     <None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
-    <None Include="..\..\Source\BinaryData\export_android.svg"/>
-    <None Include="..\..\Source\BinaryData\export_codeBlocks.svg"/>
-    <None Include="..\..\Source\BinaryData\export_linux.svg"/>
-    <None Include="..\..\Source\BinaryData\export_visualStudio.svg"/>
-    <None Include="..\..\Source\BinaryData\export_xcode.svg"/>
-    <None Include="..\..\Source\BinaryData\huckleberry_icon.svg"/>
-    <None Include="..\..\Source\BinaryData\juce-logo-with-text.svg"/>
-    <None Include="..\..\Source\BinaryData\juce_icon.png"/>
     <None Include="..\..\Source\BinaryData\offlinepage.html"/>
     <None Include="..\..\Source\BinaryData\projucer_EULA.txt"/>
-    <None Include="..\..\Source\BinaryData\projucer_login_bg.svg"/>
     <None Include="..\..\Source\BinaryData\RecentFilesMenuTemplate.nib"/>
-    <None Include="..\..\Source\BinaryData\wizard_AnimatedApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioPlugin.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_ConsoleApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_DLL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_GUI.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Highlight.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Openfile.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_OpenGL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_StaticLibrary.svg"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>
-    <None Include=".\icon.ico"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include=".\resources.rc"/>

extras/Projucer/Builds/VisualStudio2013/resources.rc

@@ -28,6 +28,3 @@ BEGIN
 END
 
 #endif
-
-IDI_ICON1 ICON DISCARDABLE "icon.ico"
-IDI_ICON2 ICON DISCARDABLE "icon.ico"

extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj

@@ -101,6 +101,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -143,101 +144,102 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Application\jucer_AppearanceSettings.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Application.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_AutoUpdater.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DocumentEditorComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_OpenDocumentManager.cpp"/>
-    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.cpp"/>
-    <ClCompile Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_ProjectContentComponent.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectExporter.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectSaver.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ResourceFile.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_CodeHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_FileHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_Icons.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_JucerTreeViewBase.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_MiscUtilities.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_SlidingPanelComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainConsoleAppTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_SimpleWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
+    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.cpp"/>
+    <ClCompile Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
+    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ResourceFile.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_AppearanceSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_StoredSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_Icons.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1385,97 +1387,91 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_gui_extra.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Application\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalSearchPathsWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_SVGPathDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_TranslationToolWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_UTF8WindowComponent.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_Application.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_AutoUpdater.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandIDs.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandLine.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DocumentEditorComponent.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_FilePreviewComponent.h"/>
-    <ClInclude Include="..\..\Source\jucer_Headers.h"/>
+    <ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_OpenDocumentManager.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_BuildTabStatusComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClassDatabase.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClientServerMessages.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ComponentListComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CppHelpers.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_DiagnosticMessage.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_LiveCodeBuilderDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_MessageIDs.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ProjectBuildInfo.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_SourceCodeRange.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_LiveBuildCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComboBoxHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentNameProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GenericComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GroupComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_HyperlinkButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ImageButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_JucerComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_LabelHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_SliderHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TabbedComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextEditorHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ToggleButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TreeViewHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ViewportHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ElementSiblingComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_FillType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_GradientPointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ImageResourceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementEllipse.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementGroup.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementImage.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRoundedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementText.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_StrokeType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentBooleanProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentChoiceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentColourProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentTextProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FilePropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FontPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_JustificationProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_PositionPropertyBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerCommandIDs.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_RelativePositionedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_SnapGridPainter.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_InlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewInlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_ItemPreviewComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_LiveBuildCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComboBoxHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentNameProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GenericComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GroupComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_HyperlinkButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ImageButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_JucerComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_LabelHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_SliderHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TabbedComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextEditorHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ToggleButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TreeViewHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ViewportHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ElementSiblingComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_FillType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_GradientPointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ImageResourceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementEllipse.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementGroup.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementImage.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRoundedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementText.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_StrokeType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentBooleanProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentChoiceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentColourProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentTextProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FilePropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FontPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_JustificationProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_PositionPropertyBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerCommandIDs.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_RelativePositionedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_SnapGridPainter.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_BinaryResources.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.h"/>
@@ -1483,54 +1479,71 @@
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_UtilityFunctions.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Exporter.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Modules.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_HeaderComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ActivityListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_BuildTabStatusComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ComponentListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ErrorListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ActivityList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClassDatabase.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClientServerMessages.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CppHelpers.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DiagnosticMessage.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ErrorList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_LiveCodeBuilderDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_MessageIDs.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ProjectBuildInfo.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_SourceCodeRange.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ExporterTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_FileTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ModuleTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTreeItemBase.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TabComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TreeItemTypes.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ContentViewComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_FileGroupInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_HeaderComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ModulesInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Module.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ModulesPanel.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Project.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectContentComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTab.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Android.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_CodeBlocks.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Make.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_MSVC.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_XCode.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExporter.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectSaver.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ResourceFile.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_AboutWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ApplicationUsageDataWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_EditorColourSchemeWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FilePathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FloatingToolWindow.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_GlobalSearchPathsWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Icons.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_JucerTreeViewBase.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_MiscUtilities.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_PresetIDs.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_RelativePath.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SlidingPanelComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_StoredSettings.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SVGPathDataComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationToolComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_UTF8Component.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Android.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_StoredSettings.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_Colours.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_PresetIDs.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_RelativePath.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_TranslationHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_FilePathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_TextWithDefaultPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_IconButton.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_Icons.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_UserSettingsPopup.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewFileWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.h"/>
@@ -1546,14 +1559,6 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Array.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_ArrayAllocationBase.h"/>
@@ -1947,39 +1952,36 @@
     <ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Source\BinaryData\gradle\gradle-wrapper.jar"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew.bat"/>
-    <None Include="..\..\Source\BinaryData\gradle\LICENSE"/>
-    <None Include="..\..\Source\BinaryData\background_logo.svg"/>
-    <None Include="..\..\Source\BinaryData\background_tile.png"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradle-wrapper.jar"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew.bat"/>
+    <None Include="..\..\Source\BinaryData\Gradle\LICENSE"/>
+    <None Include="..\..\Source\BinaryData\Icons\background_logo.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_android.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_codeBlocks.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_linux.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_visualStudio.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_xcode.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\huckleberry_icon.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce-logo-with-text.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce_icon.png"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AnimatedApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioPlugin.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_ConsoleApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_DLL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_GUI.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Highlight.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Openfile.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_OpenGL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
     <None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
     <None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
-    <None Include="..\..\Source\BinaryData\export_android.svg"/>
-    <None Include="..\..\Source\BinaryData\export_codeBlocks.svg"/>
-    <None Include="..\..\Source\BinaryData\export_linux.svg"/>
-    <None Include="..\..\Source\BinaryData\export_visualStudio.svg"/>
-    <None Include="..\..\Source\BinaryData\export_xcode.svg"/>
-    <None Include="..\..\Source\BinaryData\huckleberry_icon.svg"/>
-    <None Include="..\..\Source\BinaryData\juce-logo-with-text.svg"/>
-    <None Include="..\..\Source\BinaryData\juce_icon.png"/>
     <None Include="..\..\Source\BinaryData\offlinepage.html"/>
     <None Include="..\..\Source\BinaryData\projucer_EULA.txt"/>
-    <None Include="..\..\Source\BinaryData\projucer_login_bg.svg"/>
     <None Include="..\..\Source\BinaryData\RecentFilesMenuTemplate.nib"/>
-    <None Include="..\..\Source\BinaryData\wizard_AnimatedApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioPlugin.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_ConsoleApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_DLL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_GUI.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Highlight.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Openfile.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_OpenGL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_StaticLibrary.svg"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>
-    <None Include=".\icon.ico"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include=".\resources.rc"/>

extras/Projucer/Builds/VisualStudio2015/resources.rc

@@ -28,6 +28,3 @@ BEGIN
 END
 
 #endif
-
-IDI_ICON1 ICON DISCARDABLE "icon.ico"
-IDI_ICON2 ICON DISCARDABLE "icon.ico"

extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj

@@ -101,6 +101,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -143,101 +144,102 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)\Projucer.bsc</OutputFile>
     </Bscmake>
+    <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Application\jucer_AppearanceSettings.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Application.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Source\Application\jucer_AutoUpdater.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DocumentEditorComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
     <ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
-    <ClCompile Include="..\..\Source\Application\jucer_OpenDocumentManager.cpp"/>
-    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.cpp"/>
-    <ClCompile Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.cpp"/>
-    <ClCompile Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
-    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
-    <ClCompile Include="..\..\Source\Project\jucer_ProjectContentComponent.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectExporter.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ProjectSaver.cpp"/>
-    <ClCompile Include="..\..\Source\Project Saving\jucer_ResourceFile.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_CodeHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_FileHelpers.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_Icons.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_JucerTreeViewBase.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_MiscUtilities.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_SlidingPanelComponent.cpp"/>
-    <ClCompile Include="..\..\Source\Utility\jucer_StoredSettings.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
-    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AnimatedComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainConsoleAppTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainConsoleAppTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_NoWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_NoWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_SimpleWindow.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_SimpleWindow.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_MainTemplate_Window.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_MainTemplate_Window.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Source\BinaryData\jucer_OpenGLComponentTemplate.cpp">
+    <ClCompile Include="..\..\Source\BinaryData\Templates\jucer_OpenGLComponentTemplate.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.cpp"/>
+    <ClCompile Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_BinaryResources.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_JucerDocument.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.cpp"/>
+    <ClCompile Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.cpp"/>
+    <ClCompile Include="..\..\Source\Licenses\jucer_LicenseController.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.cpp"/>
+    <ClCompile Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.cpp"/>
+    <ClCompile Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Project\jucer_Module.cpp"/>
+    <ClCompile Include="..\..\Source\Project\jucer_Project.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.cpp"/>
+    <ClCompile Include="..\..\Source\ProjectSaving\jucer_ResourceFile.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_AppearanceSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Settings\jucer_StoredSettings.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_Icons.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.cpp"/>
+    <ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
+    <ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1385,97 +1387,91 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_gui_extra.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Application\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalSearchPathsWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_SVGPathDataWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_TranslationToolWindowComponent.h"/>
+    <ClInclude Include="..\..\Source\Application\Windows\jucer_UTF8WindowComponent.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_Application.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_AutoUpdater.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandIDs.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommandLine.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DocumentEditorComponent.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_DownloadCompileEngineThread.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_FilePreviewComponent.h"/>
-    <ClInclude Include="..\..\Source\jucer_Headers.h"/>
+    <ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
     <ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
-    <ClInclude Include="..\..\Source\Application\jucer_OpenDocumentManager.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
-    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ActivityListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_BuildTabStatusComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClassDatabase.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ClientServerMessages.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineClient.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CompileEngineServer.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ComponentListComp.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_CppHelpers.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_DiagnosticMessage.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorList.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ErrorListComponent.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_LiveCodeBuilderDLL.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_MessageIDs.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_ProjectBuildInfo.h"/>
-    <ClInclude Include="..\..\Source\LiveBuildEngine\projucer_SourceCodeRange.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_LiveBuildCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComboBoxHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentNameProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentTypeHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ComponentUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GenericComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_GroupComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_HyperlinkButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ImageButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_JucerComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_LabelHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_SliderHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TabbedComponentHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TextEditorHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ToggleButtonHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_TreeViewHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\components\jucer_ViewportHandler.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ButtonDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\documents\jucer_ComponentDocument.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ColouredElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ElementSiblingComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_FillType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_GradientPointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_ImageResourceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElement.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementEllipse.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementGroup.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementImage.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementPath.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementRoundedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementText.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PaintElementUndoableAction.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_PointComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\paintelements\jucer_StrokeType.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentBooleanProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentChoiceProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentColourProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_ComponentTextProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FilePropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_FontPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_JustificationProperty.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\properties\jucer_PositionPropertyBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentLayoutPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ComponentOverlayComponent.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_EditingPanelBase.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerCommandIDs.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_JucerDocumentEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutineEditor.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_PaintRoutinePanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_RelativePositionedRectangle.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_ResourceEditorPanel.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_SnapGridPainter.h"/>
-    <ClInclude Include="..\..\Source\ComponentEditor\ui\jucer_TestComponent.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginEditorTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioPluginFilterTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_ContentCompTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_InlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewCppFileTemplate.h"/>
+    <ClInclude Include="..\..\Source\BinaryData\Templates\jucer_NewInlineComponentTemplate.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_DocumentEditorComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_ItemPreviewComponent.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_LiveBuildCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_OpenDocumentManager.h"/>
+    <ClInclude Include="..\..\Source\CodeEditor\jucer_SourceCodeEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComboBoxHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentNameProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentTypeHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ComponentUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GenericComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_GroupComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_HyperlinkButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ImageButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_JucerComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_LabelHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_SliderHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TabbedComponentHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TextEditorHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ToggleButtonHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_TreeViewHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Components\jucer_ViewportHandler.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ButtonDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Documents\jucer_ComponentDocument.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ColouredElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ElementSiblingComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_FillType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_GradientPointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_ImageResourceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElement.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementEllipse.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementGroup.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementImage.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementPath.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementRoundedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementText.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PaintElementUndoableAction.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_PointComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\PaintElements\jucer_StrokeType.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentBooleanProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentChoiceProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentColourProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_ComponentTextProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FilePropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_FontPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_JustificationProperty.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\Properties\jucer_PositionPropertyBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentLayoutPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ComponentOverlayComponent.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_EditingPanelBase.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerCommandIDs.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_JucerDocumentEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutineEditor.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_PaintRoutinePanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_RelativePositionedRectangle.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_ResourceEditorPanel.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_SnapGridPainter.h"/>
+    <ClInclude Include="..\..\Source\ComponentEditor\UI\jucer_TestComponent.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_BinaryResources.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ComponentLayout.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_GeneratedCode.h"/>
@@ -1483,54 +1479,71 @@
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_ObjectTypes.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_PaintRoutine.h"/>
     <ClInclude Include="..\..\Source\ComponentEditor\jucer_UtilityFunctions.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Exporter.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ConfigTree_Modules.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_DependencyPathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_HeaderComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseController.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseThread.h"/>
+    <ClInclude Include="..\..\Source\Licenses\jucer_LicenseWebview.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ActivityListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_BuildTabStatusComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ComponentListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\UI\jucer_ErrorListComponent.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ActivityList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClassDatabase.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ClientServerMessages.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineClient.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CompileEngineServer.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_CppHelpers.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DiagnosticMessage.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_DownloadCompileEngineThread.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ErrorList.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_LiveCodeBuilderDLL.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_MessageIDs.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_ProjectBuildInfo.h"/>
+    <ClInclude Include="..\..\Source\LiveBuildEngine\jucer_SourceCodeRange.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ExporterTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_FileTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_LiveBuildTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ModuleTreeItems.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTab.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_ProjectTreeItemBase.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TabComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\Sidebar\jucer_TreeItemTypes.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ContentViewComponents.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_FileGroupInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_HeaderComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ModulesInformationComponent.h"/>
+    <ClInclude Include="..\..\Source\Project\UI\jucer_ProjectContentComponent.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Module.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ModulesPanel.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Project.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectContentComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTab.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Base.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Android.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_CodeBlocks.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_Make.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_MSVC.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExport_XCode.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectExporter.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ProjectSaver.h"/>
-    <ClInclude Include="..\..\Source\Project Saving\jucer_ResourceFile.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_AboutWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ApplicationUsageDataWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ColourPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_EditorColourSchemeWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FilePathPropertyComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_FloatingToolWindow.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_GlobalSearchPathsWindowComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_Icons.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_JucerTreeViewBase.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_MiscUtilities.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_PresetIDs.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ProjucerLookAndFeel.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_RelativePath.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SlidingPanelComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_StoredSettings.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_SVGPathDataComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationHelpers.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_TranslationToolComponent.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_UTF8Component.h"/>
-    <ClInclude Include="..\..\Source\Utility\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Android.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/>
+    <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_AppearanceSettings.h"/>
+    <ClInclude Include="..\..\Source\Settings\jucer_StoredSettings.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_CodeHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_Colours.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_FileHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_MiscUtilities.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_PresetIDs.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_RelativePath.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_TranslationHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\Helpers\jucer_ValueSourceHelpers.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_ColourPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_DependencyPathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_FilePathPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\PropertyComponents\jucer_TextWithDefaultPropertyComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_IconButton.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_Icons.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_JucerTreeViewBase.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_ProjucerLookAndFeel.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.h"/>
+    <ClInclude Include="..\..\Source\Utility\UI\jucer_UserSettingsPopup.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewFileWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizard.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.h"/>
@@ -1546,14 +1559,6 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginEditorTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_ContentCompTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_InlineComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewComponentTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h"/>
-    <ClInclude Include="..\..\Source\BinaryData\jucer_NewInlineComponentTemplate.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_AbstractFifo.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Array.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_ArrayAllocationBase.h"/>
@@ -1947,39 +1952,36 @@
     <ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Source\BinaryData\gradle\gradle-wrapper.jar"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew"/>
-    <None Include="..\..\Source\BinaryData\gradle\gradlew.bat"/>
-    <None Include="..\..\Source\BinaryData\gradle\LICENSE"/>
-    <None Include="..\..\Source\BinaryData\background_logo.svg"/>
-    <None Include="..\..\Source\BinaryData\background_tile.png"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradle-wrapper.jar"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew"/>
+    <None Include="..\..\Source\BinaryData\Gradle\gradlew.bat"/>
+    <None Include="..\..\Source\BinaryData\Gradle\LICENSE"/>
+    <None Include="..\..\Source\BinaryData\Icons\background_logo.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_android.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_codeBlocks.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_linux.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_visualStudio.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\export_xcode.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\huckleberry_icon.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce-logo-with-text.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\juce_icon.png"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AnimatedApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_AudioPlugin.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_ConsoleApp.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_DLL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_GUI.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Highlight.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_Openfile.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_OpenGL.svg"/>
+    <None Include="..\..\Source\BinaryData\Icons\wizard_StaticLibrary.svg"/>
     <None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
     <None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
-    <None Include="..\..\Source\BinaryData\export_android.svg"/>
-    <None Include="..\..\Source\BinaryData\export_codeBlocks.svg"/>
-    <None Include="..\..\Source\BinaryData\export_linux.svg"/>
-    <None Include="..\..\Source\BinaryData\export_visualStudio.svg"/>
-    <None Include="..\..\Source\BinaryData\export_xcode.svg"/>
-    <None Include="..\..\Source\BinaryData\huckleberry_icon.svg"/>
-    <None Include="..\..\Source\BinaryData\juce-logo-with-text.svg"/>
-    <None Include="..\..\Source\BinaryData\juce_icon.png"/>
     <None Include="..\..\Source\BinaryData\offlinepage.html"/>
     <None Include="..\..\Source\BinaryData\projucer_EULA.txt"/>
-    <None Include="..\..\Source\BinaryData\projucer_login_bg.svg"/>
     <None Include="..\..\Source\BinaryData\RecentFilesMenuTemplate.nib"/>
-    <None Include="..\..\Source\BinaryData\wizard_AnimatedApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_AudioPlugin.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_ConsoleApp.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_DLL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_GUI.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Highlight.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_Openfile.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_OpenGL.svg"/>
-    <None Include="..\..\Source\BinaryData\wizard_StaticLibrary.svg"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/>
     <None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/>
-    <None Include=".\icon.ico"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include=".\resources.rc"/>

extras/Projucer/Builds/VisualStudio2017/resources.rc

@@ -28,6 +28,3 @@ BEGIN
 END
 
 #endif
-
-IDI_ICON1 ICON DISCARDABLE "icon.ico"
-IDI_ICON2 ICON DISCARDABLE "icon.ico"

extras/Projucer/JuceLibraryCode/BinaryData.h

@@ -20,6 +20,63 @@ namespace BinaryData
     extern const char*   LICENSE;
     const int            LICENSESize = 11325;
 
+    extern const char*   background_logo_svg;
+    const int            background_logo_svgSize = 3117;
+
+    extern const char*   export_android_svg;
+    const int            export_android_svgSize = 3586;
+
+    extern const char*   export_codeBlocks_svg;
+    const int            export_codeBlocks_svgSize = 1726;
+
+    extern const char*   export_linux_svg;
+    const int            export_linux_svgSize = 28184;
+
+    extern const char*   export_visualStudio_svg;
+    const int            export_visualStudio_svgSize = 1706;
+
+    extern const char*   export_xcode_svg;
+    const int            export_xcode_svgSize = 12295;
+
+    extern const char*   huckleberry_icon_svg;
+    const int            huckleberry_icon_svgSize = 3375;
+
+    extern const char*   jucelogowithtext_svg;
+    const int            jucelogowithtext_svgSize = 5312;
+
+    extern const char*   juce_icon_png;
+    const int            juce_icon_pngSize = 45854;
+
+    extern const char*   wizard_AnimatedApp_svg;
+    const int            wizard_AnimatedApp_svgSize = 5978;
+
+    extern const char*   wizard_AudioApp_svg;
+    const int            wizard_AudioApp_svgSize = 17791;
+
+    extern const char*   wizard_AudioPlugin_svg;
+    const int            wizard_AudioPlugin_svgSize = 21296;
+
+    extern const char*   wizard_ConsoleApp_svg;
+    const int            wizard_ConsoleApp_svgSize = 3249;
+
+    extern const char*   wizard_DLL_svg;
+    const int            wizard_DLL_svgSize = 7503;
+
+    extern const char*   wizard_GUI_svg;
+    const int            wizard_GUI_svgSize = 6528;
+
+    extern const char*   wizard_Highlight_svg;
+    const int            wizard_Highlight_svgSize = 1798;
+
+    extern const char*   wizard_Openfile_svg;
+    const int            wizard_Openfile_svgSize = 1859;
+
+    extern const char*   wizard_OpenGL_svg;
+    const int            wizard_OpenGL_svgSize = 4551;
+
+    extern const char*   wizard_StaticLibrary_svg;
+    const int            wizard_StaticLibrary_svgSize = 7488;
+
     extern const char*   jucer_AnimatedComponentTemplate_cpp;
     const int            jucer_AnimatedComponentTemplate_cppSize = 1887;
 
@@ -83,89 +140,26 @@ namespace BinaryData
     extern const char*   jucer_OpenGLComponentTemplate_cpp;
     const int            jucer_OpenGLComponentTemplate_cppSize = 1716;
 
-    extern const char*   background_logo_svg;
-    const int            background_logo_svgSize = 3117;
-
-    extern const char*   background_tile_png;
-    const int            background_tile_pngSize = 151;
-
     extern const char*   colourscheme_dark_xml;
     const int            colourscheme_dark_xmlSize = 1050;
 
     extern const char*   colourscheme_light_xml;
     const int            colourscheme_light_xmlSize = 1050;
 
-    extern const char*   export_android_svg;
-    const int            export_android_svgSize = 3586;
-
-    extern const char*   export_codeBlocks_svg;
-    const int            export_codeBlocks_svgSize = 1726;
-
-    extern const char*   export_linux_svg;
-    const int            export_linux_svgSize = 28184;
-
-    extern const char*   export_visualStudio_svg;
-    const int            export_visualStudio_svgSize = 1706;
-
-    extern const char*   export_xcode_svg;
-    const int            export_xcode_svgSize = 12295;
-
-    extern const char*   huckleberry_icon_svg;
-    const int            huckleberry_icon_svgSize = 3375;
-
-    extern const char*   jucelogowithtext_svg;
-    const int            jucelogowithtext_svgSize = 5312;
-
-    extern const char*   juce_icon_png;
-    const int            juce_icon_pngSize = 45854;
-
     extern const char*   offlinepage_html;
     const int            offlinepage_htmlSize = 1155;
 
     extern const char*   projucer_EULA_txt;
     const int            projucer_EULA_txtSize = 14394;
 
-    extern const char*   projucer_login_bg_svg;
-    const int            projucer_login_bg_svgSize = 5046;
-
     extern const char*   RecentFilesMenuTemplate_nib;
     const int            RecentFilesMenuTemplate_nibSize = 2842;
 
-    extern const char*   wizard_AnimatedApp_svg;
-    const int            wizard_AnimatedApp_svgSize = 5978;
-
-    extern const char*   wizard_AudioApp_svg;
-    const int            wizard_AudioApp_svgSize = 17791;
-
-    extern const char*   wizard_AudioPlugin_svg;
-    const int            wizard_AudioPlugin_svgSize = 21296;
-
-    extern const char*   wizard_ConsoleApp_svg;
-    const int            wizard_ConsoleApp_svgSize = 3249;
-
-    extern const char*   wizard_DLL_svg;
-    const int            wizard_DLL_svgSize = 7503;
-
-    extern const char*   wizard_GUI_svg;
-    const int            wizard_GUI_svgSize = 6528;
-
-    extern const char*   wizard_Highlight_svg;
-    const int            wizard_Highlight_svgSize = 1798;
-
-    extern const char*   wizard_Openfile_svg;
-    const int            wizard_Openfile_svgSize = 1859;
-
-    extern const char*   wizard_OpenGL_svg;
-    const int            wizard_OpenGL_svgSize = 4551;
-
-    extern const char*   wizard_StaticLibrary_svg;
-    const int            wizard_StaticLibrary_svgSize = 7488;
-
     // Points to the start of a list of resource names.
     extern const char* namedResourceList[];
 
     // Number of elements in the namedResourceList array.
-    const int namedResourceListSize = 51;
+    const int namedResourceListSize = 49;
 
     // If you provide the name of one of the binary resource variables above, this function will
     // return the corresponding data and its size (or a null pointer if the name isn't found).

extras/Projucer/Source/Utility/jucer_AboutWindowComponent.h → extras/Projucer/Source/Application/Windows/jucer_AboutWindowComponent.h

@@ -26,6 +26,8 @@
 
 #pragma once
 
+
+//==============================================================================
 class AboutWindowComponent    : public Component,
                                 private Button::Listener
 {

extras/Projucer/Source/Utility/jucer_ApplicationUsageDataWindowComponent.h → extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h

@@ -26,6 +26,8 @@
 
 #pragma once
 
+
+//==============================================================================
 class ApplicationUsageDataWindowComponent    : public Component,
                                                private Button::Listener
 {

extras/Projucer/Source/Utility/jucer_EditorColourSchemeWindowComponent.h → extras/Projucer/Source/Application/Windows/jucer_EditorColourSchemeWindowComponent.h

@@ -26,8 +26,9 @@
 
 #pragma once
 
-#include "../Utility/jucer_ColourPropertyComponent.h"
+#include "../../Utility/UI/PropertyComponents/jucer_ColourPropertyComponent.h"
 
+//==============================================================================
 class EditorColourSchemeWindowComponent    : public Component
 {
 public:

extras/Projucer/Source/Utility/jucer_GlobalSearchPathsWindowComponent.h → extras/Projucer/Source/Application/Windows/jucer_GlobalSearchPathsWindowComponent.h

@@ -26,6 +26,8 @@
 
 #pragma once
 
+
+//==============================================================================
 class GlobalSearchPathsWindowComponent    : public Component,
                                             private ComboBox::Listener
 {
@@ -104,7 +106,7 @@ private:
     Label modulesLabel, sdksLabel;
     OwnedArray<PropertyComponent> pathPropertyComponents;
     ComboBox osSelector;
-    ConfigTreeItemTypes::InfoButton info;
+    InfoButton info;
 
     void comboBoxChanged (ComboBox*) override
     {

extras/Projucer/Source/Utility/jucer_SVGPathDataComponent.h → extras/Projucer/Source/Application/Windows/jucer_SVGPathDataWindowComponent.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class SVGPathDataComponent  : public Component,
                               private TextEditor::Listener
 {

extras/Projucer/Source/Utility/jucer_TranslationToolComponent.h → extras/Projucer/Source/Application/Windows/jucer_TranslationToolWindowComponent.h

@@ -24,10 +24,9 @@
   ==============================================================================
 */
 
-#ifndef JUCER_TRANSLATIONTOOLCOMPONENT_H_INCLUDED
-#define JUCER_TRANSLATIONTOOLCOMPONENT_H_INCLUDED
+#pragma once
 
-#include "jucer_TranslationHelpers.h"
+#include "../../Utility/Helpers/jucer_TranslationHelpers.h"
 
 //==============================================================================
 class TranslationToolComponent  : public Component,
@@ -198,6 +197,3 @@ private:
         editorPre.selectAll();
     }
 };
-
-
-#endif   // JUCER_TRANSLATIONTOOLCOMPONENT_H_INCLUDED

extras/Projucer/Source/Utility/jucer_UTF8Component.h → extras/Projucer/Source/Application/Windows/jucer_UTF8WindowComponent.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class UTF8Component  : public Component,
                        private TextEditor::Listener
 {

extras/Projucer/Source/Application/jucer_Application.h

@@ -29,8 +29,8 @@
 #include "jucer_MainWindow.h"
 #include "../Project/jucer_Module.h"
 #include "jucer_AutoUpdater.h"
-#include "../Code Editor/jucer_SourceCodeEditor.h"
-#include "../Utility/jucer_ProjucerLookAndFeel.h"
+#include "../CodeEditor/jucer_SourceCodeEditor.h"
+#include "../Utility/UI/jucer_ProjucerLookAndFeel.h"
 #include "../Licenses/jucer_LicenseController.h"
 
 struct ChildProcessCache;

extras/Projucer/Source/Application/jucer_AutoUpdater.cpp

@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "../Application/jucer_Headers.h"
 #include "jucer_Application.h"
 #include "jucer_AutoUpdater.h"
 

extras/Projucer/Source/Application/jucer_CommandIDs.h

@@ -24,6 +24,8 @@
   ==============================================================================
 */
 
+#pragma once
+
 /**
     A namespace to hold all the possible command IDs.
 */

extras/Projucer/Source/Application/jucer_CommandLine.cpp

@@ -24,10 +24,9 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
-#include "../Project/jucer_Project.h"
+#include "jucer_Headers.h"
 #include "../Project/jucer_Module.h"
-#include "../Utility/jucer_TranslationHelpers.h"
+#include "../Utility/Helpers/jucer_TranslationHelpers.h"
 
 #include "jucer_CommandLine.h"
 

extras/Projucer/Source/Application/jucer_CommandLine.h

@@ -26,7 +26,6 @@
 
 #pragma once
 
-
 int performCommandLine (const String& commandLine);
 
 enum { commandLineNotPerformed = 0x72346231 };

extras/Projucer/Source/Application/jucer_CommonHeaders.h

@@ -26,6 +26,7 @@
 
 #pragma once
 
+
 //==============================================================================
 struct TargetOS
 {
@@ -54,14 +55,14 @@ struct TargetOS
 typedef TargetOS::OS DependencyPathOS;
 
 //==============================================================================
-#include "../Utility/jucer_StoredSettings.h"
-#include "../Utility/jucer_Icons.h"
-#include "../Utility/jucer_MiscUtilities.h"
-#include "../Utility/jucer_CodeHelpers.h"
-#include "../Utility/jucer_FileHelpers.h"
-#include "../Utility/jucer_RelativePath.h"
-#include "../Utility/jucer_ValueSourceHelpers.h"
-#include "../Utility/jucer_PresetIDs.h"
+#include "../Settings/jucer_StoredSettings.h"
+#include "../Utility/UI/jucer_Icons.h"
+#include "../Utility/Helpers/jucer_MiscUtilities.h"
+#include "../Utility/Helpers/jucer_CodeHelpers.h"
+#include "../Utility/Helpers/jucer_FileHelpers.h"
+#include "../Utility/Helpers/jucer_RelativePath.h"
+#include "../Utility/Helpers/jucer_ValueSourceHelpers.h"
+#include "../Utility/Helpers/jucer_PresetIDs.h"
 #include "jucer_CommandIDs.h"
 
 //==============================================================================

extras/Projucer/Source/jucer_Headers.h → extras/Projucer/Source/Application/jucer_Headers.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include "../JuceLibraryCode/JuceHeader.h"
-#include "Application/jucer_CommonHeaders.h"
+#include "jucer_CommonHeaders.h"
 
 #if JUCE_DEBUG
  #define RUN_CLANG_IN_CHILD_PROCESS 1

extras/Projucer/Source/Application/jucer_Main.cpp

@@ -24,45 +24,45 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "jucer_Headers.h"
 
 #include "jucer_Application.h"
-#include "jucer_OpenDocumentManager.h"
-#include "../Code Editor/jucer_SourceCodeEditor.h"
-#include "../Utility/jucer_FilePathPropertyComponent.h"
-#include "../Project/jucer_TreeItemTypes.h"
-#include "../Utility/jucer_UTF8Component.h"
-#include "../Utility/jucer_SVGPathDataComponent.h"
-#include "../Utility/jucer_AboutWindowComponent.h"
-#include "../Utility/jucer_ApplicationUsageDataWindowComponent.h"
-#include "../Utility/jucer_EditorColourSchemeWindowComponent.h"
-#include "../Utility/jucer_GlobalSearchPathsWindowComponent.h"
-#include "../Utility/jucer_FloatingToolWindow.h"
-
-#include "../LiveBuildEngine/projucer_MessageIDs.h"
-#include "../LiveBuildEngine/projucer_CppHelpers.h"
-#include "../LiveBuildEngine/projucer_SourceCodeRange.h"
-#include "../LiveBuildEngine/projucer_ClassDatabase.h"
-#include "../LiveBuildEngine/projucer_DiagnosticMessage.h"
-
-#include "../LiveBuildEngine/projucer_CompileEngineDLL.h"
-#include "../LiveBuildEngine/projucer_CompileEngineClient.h"
-#include "../LiveBuildEngine/projucer_ActivityListComponent.h"
-#include "../LiveBuildEngine/projucer_BuildTabStatusComp.h"
-#include "../LiveBuildEngine/projucer_ComponentListComp.h"
-#include "../LiveBuildEngine/projucer_CompileEngineServer.h"
+#include "../CodeEditor/jucer_OpenDocumentManager.h"
+#include "../CodeEditor/jucer_SourceCodeEditor.h"
+#include "../Utility/UI/PropertyComponents/jucer_FilePathPropertyComponent.h"
+#include "../Project/UI/Sidebar/jucer_TreeItemTypes.h"
+#include "Windows/jucer_UTF8WindowComponent.h"
+#include "Windows/jucer_SVGPathDataWindowComponent.h"
+#include "Windows/jucer_AboutWindowComponent.h"
+#include "Windows/jucer_ApplicationUsageDataWindowComponent.h"
+#include "Windows/jucer_EditorColourSchemeWindowComponent.h"
+#include "Windows/jucer_GlobalSearchPathsWindowComponent.h"
+#include "Windows/jucer_FloatingToolWindow.h"
+
+#include "../LiveBuildEngine/jucer_MessageIDs.h"
+#include "../LiveBuildEngine/jucer_CppHelpers.h"
+#include "../LiveBuildEngine/jucer_SourceCodeRange.h"
+#include "../LiveBuildEngine/jucer_ClassDatabase.h"
+#include "../LiveBuildEngine/jucer_DiagnosticMessage.h"
+
+#include "../LiveBuildEngine/jucer_CompileEngineDLL.h"
+#include "../LiveBuildEngine/jucer_CompileEngineClient.h"
+#include "../LiveBuildEngine/UI/jucer_ActivityListComponent.h"
+#include "../LiveBuildEngine/UI/jucer_BuildTabStatusComponent.h"
+#include "../LiveBuildEngine/UI/jucer_ComponentListComponent.h"
+#include "../LiveBuildEngine/jucer_CompileEngineServer.h"
 
 juce_ImplementSingleton (CompileEngineDLL);
 
 struct ProjucerAppClasses
 {
-    #include "../Code Editor/jucer_LiveBuildCodeEditor.h"
-    #include "../LiveBuildEngine/projucer_ErrorListComponent.h"
+    #include "../CodeEditor/jucer_LiveBuildCodeEditor.h"
+    #include "../LiveBuildEngine/UI/jucer_ErrorListComponent.h"
 };
 
 #include "jucer_CommandLine.h"
 
-#include "../Project/jucer_ProjectContentComponent.cpp"
+#include "../Project/UI/jucer_ProjectContentComponent.cpp"
 #include "jucer_Application.cpp"
 
 

extras/Projucer/Source/Application/jucer_MainWindow.cpp

@@ -24,13 +24,11 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "../Application/jucer_Headers.h"
 #include "jucer_Application.h"
 #include "jucer_MainWindow.h"
-#include "jucer_OpenDocumentManager.h"
-#include "../Code Editor/jucer_SourceCodeEditor.h"
 #include "../Wizards/jucer_NewProjectWizardClasses.h"
-#include "../Utility/jucer_JucerTreeViewBase.h"
+#include "../Utility/UI/jucer_JucerTreeViewBase.h"
 
 
 //==============================================================================

extras/Projucer/Source/Application/jucer_MainWindow.h

@@ -26,8 +26,7 @@
 
 #pragma once
 
-#include "../Project/jucer_ProjectContentComponent.h"
-
+#include "../Project/UI/jucer_ProjectContentComponent.h"
 
 //==============================================================================
 /**

extras/Projucer/Source/BinaryData/projucer_login_bg.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 425 685" enable-background="new 0 0 425 685" xml:space="preserve">
-<rect y="0" fill="#4D4D4D" width="425" height="685"/>
-<g>
-	<path fill="#F7EC6F" d="M215.8,566.8c-23.1,0-41.9-18.8-41.9-41.9c0-23.1,18.8-41.9,41.9-41.9s41.9,18.8,41.9,41.9
-		C257.7,548,238.9,566.8,215.8,566.8z"/>
-	<path fill="#F390A2" d="M215.4,493.7c-17.1,0-31.1,13.9-31.1,31.1c0,17.1,13.9,31.1,31.1,31.1s31.1-13.9,31.1-31.1
-		C246.5,507.7,232.5,493.7,215.4,493.7z"/>
-	<g>
-		<path fill="#FA92A3" d="M162.6,630.2c-3.7,0-6.7-1.3-9.7-5.3l4.5-3.9c2,2.6,3.4,3.4,5.2,3.4c3.3,0,5.5-2.5,5.5-6.3v-21.4h6.2v21.4
-			C174.2,625.4,169.4,630.2,162.6,630.2z"/>
-		<path fill="#FA92A3" d="M196.7,630.2c-7.2,0-13.5-5.3-13.5-13.9v-19.6h6.2v19.3c0,5.1,3,8.4,7.3,8.4s7.3-3.3,7.3-8.4v-19.3h6.2
-			v19.6C210.2,625,203.9,630.2,196.7,630.2z"/>
-		<path fill="#FA92A3" d="M234.3,630.2c-9.5,0-17.3-7.6-17.3-17c0-9.5,7.9-17,17.3-17c4.2,0,7.9,1.4,11.3,4.2l-3.6,4.5
-			c-3.3-2.3-5.1-2.9-7.7-2.9c-6,0-10.9,4.9-10.9,11.1s4.9,11.1,10.9,11.1c2.4,0,4.5-0.7,7.6-2.9l3.7,4.6
-			C241.4,629.3,238.2,630.2,234.3,630.2z"/>
-		<path fill="#FA92A3" d="M252.1,629.8v-33.1h20.6v5.6h-14.4v8h13.9v5.6h-13.9v8.3h14.4v5.6H252.1z"/>
-	</g>
-	<g>
-		<path fill="#F7EC6F" d="M170.4,588c-4.4,0-7.9-3.5-7.9-7.9c0-4.3,3.6-7.9,7.9-7.9c2.4,0,4.5,1,6.2,3l-1.7,1.4
-			c-1.4-1.5-2.8-2.2-4.5-2.2c-3.1,0-5.6,2.5-5.6,5.7c0,3.2,2.4,5.7,5.6,5.7c3,0,5.1-2.1,5.2-4.8h-5.4v-2h7.7v1.1
-			C178,584.4,174.9,588,170.4,588z"/>
-		<path fill="#F7EC6F" d="M183.3,582.3v5.5H181v-11.7h2.2v1.7c0.8-1,2-1.8,3.8-1.9v2.1C184.2,578.4,183.3,580.4,183.3,582.3z"/>
-		<path fill="#F7EC6F" d="M196.6,587.8c-0.3-0.4-0.4-1.1-0.4-1.6c-0.8,0.9-2.3,1.8-3.9,1.8c-2.3,0-3.9-1.2-3.9-3.2
-			c0-1.9,1.2-3.9,7.5-4.9c-0.1-1.1-1-1.8-2.4-1.8c-1.4,0-2.3,0.5-3.3,1.2l-1.3-1.5c1.4-1.2,3-1.8,4.8-1.8c2,0,4.5,0.8,4.5,4.1v5
-			c0,0.8,0.1,1.8,0.7,2.8H196.6z M196,581.7c-4.3,0.7-5.3,1.8-5.3,3c0,0.9,1,1.3,2,1.3c1.5,0,3.3-1.3,3.3-3.5V581.7z"/>
-		<path fill="#F7EC6F" d="M208,588c-1.6,0-3-0.7-3.7-1.7v6.1H202v-16.2h2.2v1.5c0.8-0.9,2.1-1.7,3.7-1.7c3.2,0,5.9,2.7,5.9,6
-			C213.8,585.2,211.2,588,208,588z M207.9,578c-2.1,0-3.7,1.8-3.7,3.9c0,2.2,1.6,3.9,3.7,3.9c2.1,0,3.7-1.8,3.7-3.9
-			C211.6,579.8,210,578,207.9,578z"/>
-		<path fill="#F7EC6F" d="M227.7,582.8h-9.4c0.3,1.7,1.9,3.1,3.7,3.1c1.1,0,2.4-0.5,3.3-1.5l1.5,1.4c-1.4,1.5-3.1,2.2-4.9,2.2
-			c-3.3,0-6-2.7-6-6c0-3.3,2.7-6,6-6c3.4,0,5.8,2.7,5.8,6C227.7,582.3,227.7,582.8,227.7,582.8z M221.9,578c-1.8,0-3.3,1.2-3.6,2.9
-			h7C225,579.1,223.7,578,221.9,578z"/>
-		<path fill="#F7EC6F" d="M236.9,574.3c-0.6-0.6-1.2-0.8-1.7-0.8c-1.1,0-2,0.7-2,2.6h3.6v2h-3.6v9.7H231v-9.7h-1.9v-2h1.9
-			c0.1-3.1,1.9-4.7,4.1-4.7c1.2,0,2.3,0.5,3.3,1.5L236.9,574.3z"/>
-		<path fill="#F7EC6F" d="M241.2,582.3v5.5H239v-11.7h2.2v1.7c0.8-1,2-1.8,3.8-1.9v2.1C242.2,578.4,241.2,580.4,241.2,582.3z"/>
-		<path fill="#F7EC6F" d="M255.2,587.8v-1.2c-0.6,0.7-1.8,1.4-3.3,1.4c-2.7,0-4.7-1.9-4.7-5v-6.8h2.2v6.7c0,2,1.2,3.1,2.8,3.1
-			c1.6,0,2.9-1.2,2.9-3.1v-6.6h2.2v11.7H255.2z"/>
-		<path fill="#F7EC6F" d="M262.6,574.3c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.6-1.5,1.5-1.5c0.8,0,1.4,0.7,1.4,1.5
-			C264,573.7,263.4,574.3,262.6,574.3z M261.4,587.8v-11.7h2.2v11.7H261.4z"/>
-		<path fill="#F7EC6F" d="M270.5,578.1v9.7h-2.2v-9.7H266v-2h2.3v-3.7h2.2v3.7h3v2H270.5z"/>
-	</g>
-</g>
-<path fill="#FFFFFF" d="M94.9,83.6h-7.1v15.1h-5.4V62.2h12.4c6.7,0,11.6,4.6,11.6,10.7C106.5,79,101.6,83.6,94.9,83.6z M94.8,67h-7
-	v11.8h7c3.9,0,6.2-2.7,6.2-5.9C101.1,69.7,98.8,67,94.8,67z"/>
-<path fill="#FFFFFF" d="M136.6,98.6l-15.4-18.9v-0.5h5.7c4.2,0,7-2.4,7-6.1c0-3.7-2.8-6.1-7-6.1h-7v31.7h-5.4V62.2h12.8
-	c7.6,0,12,4.8,12,11c0,5.4-4,9.8-9,10l13,15.5H136.6z"/>
-<path fill="#FFFFFF" d="M164.7,99.1c-10.4,0-18.8-8.3-18.8-18.7c0-10.4,8.4-18.7,18.8-18.7c10.4,0,18.8,8.3,18.8,18.7
-	C183.6,90.7,175.1,99.1,164.7,99.1z M164.7,66.8c-7.4,0-13.3,6-13.3,13.6S157.3,94,164.7,94c7.4,0,13.4-6,13.4-13.6
-	S172.2,66.8,164.7,66.8z"/>
-<path fill="#FFFFFF" d="M195,99.1c-4,0-7.2-1.5-10-5.2l3.9-3.3c1.9,2.5,3.8,3.5,6.1,3.5c4.2,0,7.1-3.2,7.1-8.1V62.2h5.4V86
-	C207.5,93.8,202.3,99.1,195,99.1z"/>
-<path fill="#FFFFFF" d="M230.6,99.1c-7.8,0-14.5-5.8-14.5-15.2V62.2h5.4v21.4c0,6.4,3.8,10.5,9.1,10.5c5.4,0,9.2-4.1,9.2-10.5V62.2
-	h5.4v21.7C245.2,93.3,238.5,99.1,230.6,99.1z"/>
-<path fill="#FFFFFF" d="M270.7,99.1c-10.4,0-18.8-8.3-18.8-18.7c0-10.4,8.5-18.7,18.8-18.7c4.6,0,8.7,1.6,11.8,4.2l-3.2,3.9
-	c-3.3-2.3-5.5-3.1-8.6-3.1c-7.4,0-13.4,6-13.4,13.6S263.3,94,270.7,94c3,0,5.4-0.9,8.5-3.1l3.2,4C278.5,98,274.9,99.1,270.7,99.1z"
-	/>
-<path fill="#FFFFFF" d="M290.3,98.6V62.2h22V67h-16.6v10.8h15.9v4.8h-15.9v11.2h16.6v4.8H290.3z"/>
-<path fill="#FFFFFF" d="M343.9,98.6l-15.4-18.9v-0.5h5.7c4.2,0,7-2.4,7-6.1c0-3.7-2.8-6.1-7-6.1h-7v31.7h-5.4V62.2h12.8
-	c7.6,0,12,4.8,12,11c0,5.4-4,9.8-9,10l13,15.5H343.9z"/>
-</svg>

extras/Projucer/Source/Application/jucer_DocumentEditorComponent.cpp → extras/Projucer/Source/CodeEditor/jucer_DocumentEditorComponent.cpp

@@ -24,9 +24,8 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "../Application/jucer_Headers.h"
 #include "jucer_DocumentEditorComponent.h"
-#include "../Project/jucer_ProjectContentComponent.h"
 #include "../Application/jucer_Application.h"
 
 

extras/Projucer/Source/Application/jucer_DocumentEditorComponent.h → extras/Projucer/Source/CodeEditor/jucer_DocumentEditorComponent.h

@@ -28,10 +28,7 @@
 
 #include "jucer_OpenDocumentManager.h"
 
-
 //==============================================================================
-/**
-*/
 class DocumentEditorComponent  : public Component,
                                  public OpenDocumentManager::DocumentCloseListener
 {

extras/Projucer/Source/Application/jucer_FilePreviewComponent.h → extras/Projucer/Source/CodeEditor/jucer_ItemPreviewComponent.h

@@ -26,12 +26,8 @@
 
 #pragma once
 
-#include "../Utility/jucer_ProjucerLookAndFeel.h"
-
 
 //==============================================================================
-/**
-*/
 class ItemPreviewComponent  : public Component
 {
 public:

extras/Projucer/Source/Code Editor/jucer_LiveBuildCodeEditor.h → extras/Projucer/Source/CodeEditor/jucer_LiveBuildCodeEditor.h

@@ -24,9 +24,11 @@
   ==============================================================================
 */
 
-class LiveBuildCodeEditorDocument;
+#pragma once
 
+class LiveBuildCodeEditorDocument;
 
+//==============================================================================
 class LiveBuildCodeEditor  : public CppCodeEditorComponent,
                              private Timer
 {

extras/Projucer/Source/Application/jucer_OpenDocumentManager.cpp → extras/Projucer/Source/CodeEditor/jucer_OpenDocumentManager.cpp

@@ -24,11 +24,10 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "../Application/jucer_Headers.h"
 #include "jucer_OpenDocumentManager.h"
-#include "jucer_FilePreviewComponent.h"
-#include "../Code Editor/jucer_SourceCodeEditor.h"
-#include "jucer_Application.h"
+#include "../CodeEditor/jucer_ItemPreviewComponent.h"
+#include "../Application/jucer_Application.h"
 
 
 //==============================================================================

extras/Projucer/Source/Application/jucer_OpenDocumentManager.h → extras/Projucer/Source/CodeEditor/jucer_OpenDocumentManager.h

@@ -29,8 +29,6 @@
 #include "../Project/jucer_Project.h"
 
 //==============================================================================
-/**
-*/
 class OpenDocumentManager
 {
 public:

extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.cpp → extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp

@@ -24,11 +24,9 @@
   ==============================================================================
 */
 
-#include "../jucer_Headers.h"
+#include "../Application/jucer_Headers.h"
 #include "jucer_SourceCodeEditor.h"
 #include "../Application/jucer_Application.h"
-#include "../Application/jucer_OpenDocumentManager.h"
-
 
 //==============================================================================
 SourceCodeDocument::SourceCodeDocument (Project* p, const File& f)

extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.h → extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.h

@@ -26,9 +26,7 @@
 
 #pragma once
 
-#include "../Project/jucer_Project.h"
-#include "../Application/jucer_DocumentEditorComponent.h"
-
+#include "jucer_DocumentEditorComponent.h"
 
 //==============================================================================
 class SourceCodeDocument  : public OpenDocumentManager::Document

extras/Projucer/Source/ComponentEditor/components/jucer_ButtonHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ButtonHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class ButtonHandler  : public ComponentTypeHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ComboBoxHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class ComboBoxHandler  : public ComponentTypeHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_ComponentNameProperty.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentNameProperty.h

@@ -28,8 +28,7 @@
 
 #include "jucer_ComponentTypeHandler.h"
 #include "jucer_ComponentUndoableAction.h"
-#include "../properties/jucer_ComponentTextProperty.h"
-
+#include "../Properties/jucer_ComponentTextProperty.h"
 
 //==============================================================================
 class ComponentNameProperty  : public ComponentTextProperty <Component>

extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp → extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp

@@ -24,16 +24,16 @@
   ==============================================================================
 */
 
-#include "../../jucer_Headers.h"
+#include "../../Application/jucer_Headers.h"
 #include "../../Application/jucer_Application.h"
 #include "../jucer_ObjectTypes.h"
 #include "../jucer_UtilityFunctions.h"
-#include "../ui/jucer_JucerCommandIDs.h"
-#include "../ui/jucer_ComponentOverlayComponent.h"
+#include "../UI/jucer_JucerCommandIDs.h"
+#include "../UI/jucer_ComponentOverlayComponent.h"
 #include "jucer_ComponentNameProperty.h"
-#include "../properties/jucer_PositionPropertyBase.h"
-#include "../properties/jucer_ComponentColourProperty.h"
-#include "../ui/jucer_TestComponent.h"
+#include "../Properties/jucer_PositionPropertyBase.h"
+#include "../Properties/jucer_ComponentColourProperty.h"
+#include "../UI/jucer_TestComponent.h"
 
 static String getTypeInfoName (const std::type_info& info)
 {

extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.h

@@ -29,8 +29,7 @@
 class ComponentOverlayComponent;
 class ComponentLayout;
 #include "../jucer_GeneratedCode.h"
-#include "../ui/jucer_RelativePositionedRectangle.h"
-
+#include "../UI/jucer_RelativePositionedRectangle.h"
 
 //==============================================================================
 /**

extras/Projucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentUndoableAction.h

@@ -26,8 +26,7 @@
 
 #pragma once
 
-#include "../ui/jucer_JucerDocumentEditor.h"
-
+#include "../UI/jucer_JucerDocumentEditor.h"
 
 //==============================================================================
 template <class ComponentType>

extras/Projucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_GenericComponentHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class GenericComponent  : public Component
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_GroupComponentHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class GroupComponentHandler  : public ComponentTypeHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_HyperlinkButtonHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_HyperlinkButtonHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class HyperlinkButtonHandler  : public ButtonHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_ImageButtonHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_ImageButtonHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class ImageButtonHandler  : public ButtonHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_JucerComponentHandler.h

@@ -26,12 +26,11 @@
 
 #pragma once
 
-#include "../ui/jucer_TestComponent.h"
-#include "../properties/jucer_FilePropertyComponent.h"
-#include "../properties/jucer_ComponentTextProperty.h"
+#include "../UI/jucer_TestComponent.h"
+#include "../Properties/jucer_FilePropertyComponent.h"
+#include "../Properties/jucer_ComponentTextProperty.h"
 #include "jucer_ComponentUndoableAction.h"
-#include "../../Project/jucer_ProjectContentComponent.h"
-
+#include "../../Project/UI/jucer_ProjectContentComponent.h"
 
 //==============================================================================
 class JucerComponentHandler  : public ComponentTypeHandler

extras/Projucer/Source/ComponentEditor/components/jucer_LabelHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_LabelHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 class LabelHandler  : public ComponentTypeHandler
 {
 public:

extras/Projucer/Source/ComponentEditor/components/jucer_SliderHandler.h → extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h

@@ -24,6 +24,10 @@
   ==============================================================================
 */
 
+#pragma once
+
+
+//==============================================================================
 static const Slider::SliderStyle sliderStyleTypes[] =
 {
     Slider::LinearHorizontal,