diff --git a/Makefile b/Makefile
index 8b91b53..cbad1d7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,45 +5,29 @@ FILES =\
 	examples\
 	changelog.txt
 	
-VER  = `cat version.txt`
-DATE = `svn info fullcalendar.js | grep Date: | sed 's/.*: //g'`
-REV  = `svn info fullcalendar.js | grep Rev: | sed 's/.*: //g'`
-
-hey:
-	@for f in fullcalendar/*.js; do echo $$f; done
+min:
+	@java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar.min.js fullcalendar/fullcalendar.js
+	sed -i "s/* FullCalendar/& v`cat version.txt`/" build/fullcalendar.min.js
+	sed -i "s/* Date:/& `svn info fullcalendar/fullcalendar.js | grep Date: | sed 's/.*: //g'`/" build/fullcalendar.min.js
+	sed -i "s/* Revision:/& `svn info fullcalendar/fullcalendar.js | grep Rev: | sed 's/.*: //g'`/" build/fullcalendar.min.js
 	
 zip:
 	@mkdir -p build/F
-	@cp -rt build/F ${FILES}
-	#@rm -rf `find build/fullcalendar -type d -name .svn`
-	
-q:
-	@for f in fullcalendar/*.js; do\
-		echo `svn info $$f`;\
+	@cp -rt build/F ${FILES} .svn
+	@for f in build/F/fullcalendar/*.js; do\
+		sed -i "s/* FullCalendar/& v`cat version.txt`/" $$f;\
+		sed -i "s/* Date:/& `svn info $$f | grep Date: | sed 's/.*: //g'`/" $$f;\
+		sed -i "s/* Revision:/& `svn info $$f | grep Rev: | sed 's/.*: //g'`/" $$f;\
 		done
-		
-yo:
-		
-		#sed -i "s/FullCalendar/& v`cat version.txt`/" $$f;\
-		#sed -i "s/Date:/& `svn info $$f | grep Date: | sed 's/.*: //g'`/" $$f;\
-		#sed -i "s/Revision:/& `svn info $$f | grep Rev: | sed 's/.*: //g'`/" $$f;\
-	
-	
-	#@cd build/fullcalendar; zip -r fullcalendar-`cat ../../version.txt`.zip *
-	#@mv build/fullcalendar/fullcalendar-`cat version.txt`.zip dist
-	#@rm -rf build/fullcalendar
-	
-something:
-	@cp -rt fullcalendar ${FILES}
-	@rm -rf `find fullcalendar -type d -name .svn`
-	
-	@sed -i "s/FullCalendar/& v${VER}/" fullcalendar/fullcalendar.js
-	@sed -i "s/Date:/& ${DATE}/" fullcalendar/fullcalendar.js
-	@sed -i "s/Revision:/& ${REV}/" fullcalendar/fullcalendar.js
-	
-	@mkdir -p dist
-	@zip -r dist/fullcalendar-${VER}.zip fullcalendar
-	@rm -rf fullcalendar
+	@rm -rf `find build/F -type d -name .svn`
+	@if [ -e build/fullcalendar.min.js ];\
+		then cp build/fullcalendar.min.js build/F/fullcalendar;\
+		else echo "WARNING: fullcalendar.js not yet minified.";\
+		fi
+	@cd build/F; zip -r fullcalendar-`cat ../../version.txt`.zip *
+	@mv build/F/fullcalendar-*.zip dist
+	@rm -rf build/F
+	@rm -f build/fullcalendar.min.js
 	
 clean:
 	@rm -rf dist/*
diff --git a/examples/basic.html b/examples/basic.html
index f9f500b..0a4382b 100644
--- a/examples/basic.html
+++ b/examples/basic.html
@@ -16,11 +16,11 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
 <script type='text/javascript' src='../jquery/ui.core.js'></script>
 <script type='text/javascript' src='../jquery/ui.draggable.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {
diff --git a/examples/gcal.html b/examples/gcal.html
index ca7b505..87d1cc2 100644
--- a/examples/gcal.html
+++ b/examples/gcal.html
@@ -22,10 +22,10 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
-<script type='text/javascript' src='../gcal.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/gcal.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {
diff --git a/examples/json.html b/examples/json.html
index 61ff5f0..0efe145 100644
--- a/examples/json.html
+++ b/examples/json.html
@@ -22,11 +22,11 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
 <script type='text/javascript' src='../jquery/ui.core.js'></script>
 <script type='text/javascript' src='../jquery/ui.draggable.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {
diff --git a/fullcalendar/fullcalendar.js b/fullcalendar/fullcalendar.js
index 4f6331c..e8bb061 100644
--- a/fullcalendar/fullcalendar.js
+++ b/fullcalendar/fullcalendar.js
@@ -1,4 +1,4 @@
-/*
+/*!
  * FullCalendar
  * http://arshaw.com/fullcalendar/
  *
diff --git a/legacy/examples/basic.html b/test/legacy/examples/basic.html
similarity index 100%
rename from legacy/examples/basic.html
rename to test/legacy/examples/basic.html
diff --git a/legacy/examples/gcal.html b/test/legacy/examples/gcal.html
similarity index 100%
rename from legacy/examples/gcal.html
rename to test/legacy/examples/gcal.html
diff --git a/legacy/examples/json.html b/test/legacy/examples/json.html
similarity index 100%
rename from legacy/examples/json.html
rename to test/legacy/examples/json.html
diff --git a/legacy/examples/json_events.php b/test/legacy/examples/json_events.php
similarity index 100%
rename from legacy/examples/json_events.php
rename to test/legacy/examples/json_events.php
diff --git a/legacy/jquery/jquery.js b/test/legacy/jquery/jquery.js
similarity index 100%
rename from legacy/jquery/jquery.js
rename to test/legacy/jquery/jquery.js
diff --git a/legacy/jquery/ui.core.js b/test/legacy/jquery/ui.core.js
similarity index 100%
rename from legacy/jquery/ui.core.js
rename to test/legacy/jquery/ui.core.js
diff --git a/legacy/jquery/ui.draggable.js b/test/legacy/jquery/ui.draggable.js
similarity index 100%
rename from legacy/jquery/ui.draggable.js
rename to test/legacy/jquery/ui.draggable.js
diff --git a/version.txt b/version.txt
index 9459d4b..5625e59 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.1
+1.2