diff --git a/Project.xml b/Project.xml
index 9215a2185..f25ce5169 100644
--- a/Project.xml
+++ b/Project.xml
@@ -45,51 +45,48 @@
 	
 	<define name="PRELOAD_ALL" unless="web" />
 	
-	<library name="songs" preload="false" unless="PRELOAD_ALL"/>
-	<library name="songs" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/songs" library="songs" exclude="*.ogg" if="web"/>
-	<assets path="assets/songs" library="songs" exclude="*.mp3" unless="web"/>
-
-	<library name="shared" preload="true"/>
-	<!-- <library name="shared" preload="false" unless="PRELOAD_ALL"/>
-	<library name="shared" preload="true" if="PRELOAD_ALL"/> -->
-	<assets path="assets/shared" library="shared" exclude="*.ogg" if="web"/>
-	<assets path="assets/shared" library="shared" exclude="*.mp3" unless="web"/>
-
-	<library name="tutorial" preload="false" unless="PRELOAD_ALL"/>
-	<library name="tutorial" preload="true" if="PRELOAD_ALL"/>
+	<section if="PREELOAD_ALL">
+		<library name="songs"    preload="true" />
+		<library name="shared"   preload="true" />
+		<library name="tutorial" preload="true" />
+		<library name="week1"    preload="true" />
+		<library name="week2"    preload="true" />
+		<library name="week3"    preload="true" />
+		<library name="week4"    preload="true" />
+		<library name="week5"    preload="true" />
+		<library name="week6"    preload="true" />
+	</section>
+	
+	<section unless="PREELOAD_ALL">
+		<library name="songs"    preload="false" />
+		<library name="shared"   preload="false" />
+		<library name="tutorial" preload="false" />
+		<library name="week1"    preload="false" />
+		<library name="week2"    preload="false" />
+		<library name="week3"    preload="false" />
+		<library name="week4"    preload="false" />
+		<library name="week5"    preload="false" />
+		<library name="week6"    preload="false" />
+	</section>
+	
+	<assets path="assets/songs"    library="songs"    exclude="*.ogg" if="web"/>
+	<assets path="assets/songs"    library="songs"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/shared"   library="shared"   exclude="*.ogg" if="web"/>
+	<assets path="assets/shared"   library="shared"   exclude="*.mp3" unless="web"/>
 	<assets path="assets/tutorial" library="tutorial" exclude="*.ogg" if="web"/>
 	<assets path="assets/tutorial" library="tutorial" exclude="*.mp3" unless="web"/>
-
-	<library name="week1" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week1" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week1" library="week1" exclude="*.ogg" if="web"/>
-	<assets path="assets/week1" library="week1" exclude="*.mp3" unless="web"/>
-
-	<library name="week2" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week2" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week2" library="week2" exclude="*.ogg" if="web"/>
-	<assets path="assets/week2" library="week2" exclude="*.mp3" unless="web"/>
-
-	<library name="week3" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week3" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week3" library="week3" exclude="*.ogg" if="web"/>
-	<assets path="assets/week3" library="week3" exclude="*.mp3" unless="web"/>
-
-	<library name="week4" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week4" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week4" library="week4" exclude="*.ogg" if="web"/>
-	<assets path="assets/week4" library="week4" exclude="*.mp3" unless="web"/>
-
-	<library name="week5" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week5" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week5" library="week5" exclude="*.ogg" if="web"/>
-	<assets path="assets/week5" library="week5" exclude="*.mp3" unless="web"/>
-
-	<library name="week6" preload="false" unless="PRELOAD_ALL"/>
-	<library name="week6" preload="true" if="PRELOAD_ALL"/>
-	<assets path="assets/week6" library="week6" exclude="*.ogg" if="web"/>
-	<assets path="assets/week6" library="week6" exclude="*.mp3" unless="web"/>
+	<assets path="assets/week1"    library="week1"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week1"    library="week1"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week2"    library="week2"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week2"    library="week2"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week3"    library="week3"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week3"    library="week3"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week4"    library="week4"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week4"    library="week4"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week5"    library="week5"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week5"    library="week5"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week6"    library="week6"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week6"    library="week6"    exclude="*.mp3" unless="web"/>
 	
 	<assets path='example_mods' rename='mods' embed='false'/>
 	<!-- <template path='mods' /> -->