diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..57b9c89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+dist/*.swf
+dist/*.html
diff --git a/.gitmodules b/.gitmodules
index dcc10f5..d066830 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 [submodule "flixel"]
 	path = flixel
 	url = git@github.com:meatballhat/flixel.git
-[submodule "Flx-Invaders"]
-	path = Flx-Invaders
+[submodule "FlxInvaders"]
+	path = FlxInvaders
 	url = git@github.com:meatballhat/Flx-Invaders.git
 [submodule "FlxCollisions"]
 	path = FlxCollisions
diff --git a/Flx-Invaders b/FlxInvaders
similarity index 100%
rename from Flx-Invaders
rename to FlxInvaders
diff --git a/Makefile b/Makefile
index df319c3..f777d00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,38 @@
-FLIXEL := $(PWD)/flixel
-WRAP := $(PWD)/bin/flashhtml.py
 TOP := $(PWD)
+FLIXEL := $(TOP)/flixel
+PYTHON := python2.6
+WRAP := $(TOP)/flash_html_wrap.py
+DIST := $(TOP)/dist
 
 MXMLC := mxmlc
 MXMLC_FLAGS := -sp $(FLIXEL)
 
 PROJECTS = \
-	Flx-Invaders \
+	FlxInvaders \
 	FlxBloom \
 	FlxBlur \
 	FlxCollisions \
 	FlxTeroids \
 	HelloWorld
 
-mkproject = cd $(project)/src && $(MAKE) && cd $(TOP) ;
+mkproject = \
+	cd $(project)/src && $(MAKE) && \
+	cd $(TOP) && \
+	$(call mkhtmlwrap,$(project)) && \
+	cd $(TOP) ;
+
+
+mkhtmlwrap = \
+	cp $(TOP)/$(1)/src/$(1).swf $(DIST)/$(1).swf && \
+	$(PYTHON) $(WRAP) -P $(DIST)/$(1).properties > $(DIST)/$(1).html
+	
+
+%.html: %.swf
+	$(call mkhtmlwrap,$*)
 
 
 all:
-	$(foreach project,$(PROJECTS),$(mkproject))
+	$(foreach project,$(PROJECTS),$(mkproject)) echo "done" ;
 
 
 .PHONY: all
diff --git a/dist/FlxBloom.properties b/dist/FlxBloom.properties
new file mode 100644
index 0000000..a9c8f1f
--- /dev/null
+++ b/dist/FlxBloom.properties
@@ -0,0 +1,8 @@
+title=Flixel Bloom
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=flixel-bloom-app
+swf=FlxBloom
+width=800
+height=600
diff --git a/dist/FlxBlur.properties b/dist/FlxBlur.properties
new file mode 100644
index 0000000..00e959a
--- /dev/null
+++ b/dist/FlxBlur.properties
@@ -0,0 +1,8 @@
+title=Flixel Blur
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=flixel-blur-app
+swf=FlxBlur
+width=800
+height=600
diff --git a/dist/FlxCollisions.properties b/dist/FlxCollisions.properties
new file mode 100644
index 0000000..d67d683
--- /dev/null
+++ b/dist/FlxCollisions.properties
@@ -0,0 +1,8 @@
+title=Flixel Collisions
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=flixel-collisions-app
+swf=FlxCollisions
+width=800
+height=600
diff --git a/dist/FlxInvaders.properties b/dist/FlxInvaders.properties
new file mode 100644
index 0000000..9661b3c
--- /dev/null
+++ b/dist/FlxInvaders.properties
@@ -0,0 +1,8 @@
+title=Flixel Invaders
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=flixel-invaders-app
+swf=FlxInvaders
+width=800
+height=600
diff --git a/dist/FlxTeroids.properties b/dist/FlxTeroids.properties
new file mode 100644
index 0000000..e828524
--- /dev/null
+++ b/dist/FlxTeroids.properties
@@ -0,0 +1,8 @@
+title=Flixel Teroids
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=flixel-teroids-app
+swf=FlxTeroids
+width=800
+height=600
diff --git a/dist/HelloWorld.properties b/dist/HelloWorld.properties
new file mode 100644
index 0000000..b1f8086
--- /dev/null
+++ b/dist/HelloWorld.properties
@@ -0,0 +1,8 @@
+title=Hello World
+bgcolor=#000
+useBrowserHistory=false
+expressInstallSwf=false
+application=hello-world-app
+swf=HelloWorld
+width=800
+height=600
diff --git a/bin/flashhtml.py b/flash_html_wrap.py
old mode 100755
new mode 100644
similarity index 100%
rename from bin/flashhtml.py
rename to flash_html_wrap.py