diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..99d7dc6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+server.js.logs
\ No newline at end of file
diff --git a/ExpressStarter/.gitignore b/ExpressStarter/.gitignore
deleted file mode 100644
index b512c09..0000000
--- a/ExpressStarter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
\ No newline at end of file
diff --git a/ExpressStarter/server.js.logs/0.txt b/ExpressStarter/server.js.logs/0.txt
deleted file mode 100644
index d541259..0000000
--- a/ExpressStarter/server.js.logs/0.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-   info  - socket.io started
-Express server listening on port NaN in development mode
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-   debug - served static content /socket.io.js
-   debug - client authorized
-   info  - handshake authorized 5331755071522759635
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-   debug - setting request GET /socket.io/1/xhr-polling/5331755071522759635?t=1328573729991
-   debug - setting poll timeout
-   debug - client authorized for 
-   debug - clearing poll timeout
-   debug - xhr-polling writing 1::
-   debug - set close timeout for client 5331755071522759635
-   debug - xhr-polling received data packet 5:::{"name":"setname","args":["WebMatrix User"]}
-   debug - broadcasting packet
-   debug - setting request GET /socket.io/1/xhr-polling/5331755071522759635?t=1328573730002
-   debug - setting poll timeout
-   debug - clearing poll timeout
-   debug - xhr-polling writing 5:::{"name":"messages","args":[{"buffer":[]}]}
-   debug - set close timeout for client 5331755071522759635
-   debug - discarding transport
-   debug - cleared close timeout for client 5331755071522759635
-   debug - setting request GET /socket.io/1/xhr-polling/5331755071522759635?t=1328573730013
-   debug - setting poll timeout
-   debug - discarding transport
-   debug - cleared close timeout for client 5331755071522759635
-   debug - xhr-polling received data packet 3:::test
-   debug - broadcasting packet
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-Error: This is a 500 Error
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:11:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-[object Object]
-    at C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\routes\global.js:16:15
-    at callbacks (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:272:11)
-    at param (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:246:11)
-    at pass (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:253:5)
-    at Router._dispatch (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:280:4)
-    at Object.handle (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\lib\router\index.js:45:10)
-    at next (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\express\node_modules\connect\lib\http.js:203:15)
-    at Object.oncomplete (C:\Users\justbe\Dropbox\Code\ExpressStarter\ExpressStarter\node_modules\connect\lib\middleware\static.js:150:11)
-   debug - clearing poll timeout
-   debug - xhr-polling writing 8::
-   debug - set close timeout for client 5331755071522759635
-   debug - xhr-polling closed due to exceeded duration
-   debug - fired close timeout for client 5331755071522759635
-   info  - transport end
-   debug - broadcasting packet
-   debug - discarding transport
diff --git a/ExpressStarter/Procfile b/Procfile
similarity index 100%
rename from ExpressStarter/Procfile
rename to Procfile
diff --git a/TBEX.xml b/TBEX.xml
deleted file mode 100644
index 9afc122..0000000
--- a/TBEX.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WebPlatform>
-  <Links>
-    <AddLink InDashboard="True">
-      <Title>Welcome to Node.js</Title>
-      <Description>Node.js is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices.</Description>
-      <Uri>http://nodejs.org/</Uri>
-      <ImageUri>http://justbe-server/node32.png</ImageUri>
-    </AddLink>
-    <AddLink InDashboard="True" InLearn="True">
-      <Title>Node.js API Documentation</Title>
-      <Description>Use the documentation from nodejs.org to get started.</Description>
-      <Uri>http://nodejs.org/docs/latest/api/index.html</Uri>
-      <ImageUri>http://justbe-server/node32.png</ImageUri>
-    </AddLink>
-	  <AddLink InDashboard="True" InLearn="True">
-		  <Title>Browse the npm registry</Title>
-		  <Description>npm is a package manager for node. You can use it to install and publish your node programs. It manages dependencies and does other cool stuff.</Description>
-		  <Uri>http://npmjs.org/</Uri>
-		  <ImageUri>http://justbe-server/node32.png</ImageUri>
-	  </AddLink>
-  </Links>
-
-</WebPlatform>
diff --git a/TemplateFeedEntry.xml b/TemplateFeedEntry.xml
deleted file mode 100644
index c3c6b6f..0000000
--- a/TemplateFeedEntry.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <entry type="application">
-    <installedBy>{58520BA8-DF03-4D4B-A311-5452F5DA5957}</installedBy>
-    <productId>ExpressStarter</productId>
-    <title>Express Starter</title>
-    <version>0.1</version>
-    <summary>Pre-built site set up with Node.js and the Express framework</summary>
-    <id>http://example.com/ExpressStarter</id>
-    <updated>2011-01-14T20:30:02Z</updated>
-    <published>2011-01-14T20:30:02Z</published>
-    <longSummary>Pre-built site set up with Node.js and the Express framework</longSummary>
-    <link href="http://example.com/ExpressStarter" />
-    <images>
-		<icon>http://go.microsoft.com/fwlink/?LinkId=195180</icon>
-    </images>
-    <keywords>
-      <keywordId>NodeTemplate</keywordId>
-    </keywords>
-    <author>
-      <name>Justin Beckwith</name>
-      <uri>http://jbeckwith.com/</uri>
-    </author>
-	  <dependency>
-		  <and>
-			  <dependency>
-				  <productId>nodejs</productId>
-			  </dependency>
-			  <dependency>
-				  <productId>iisnode32</productId>
-			  </dependency>
-		  </and>
-	  </dependency>
-    <installers>
-      <installer>
-        <id>1</id>
-        <languageId>en</languageId>
-        <installerFile>
-          <fileSize>50</fileSize>
-          <installerURL>file://%ProgramFiles%\Microsoft WebMatrix\templates\ExpressStarter.zip</installerURL>
-          <sha1>{templateSha1Hash}</sha1>
-        </installerFile>
-        <msDeploy />
-      </installer>
-    </installers>
-  </entry>
-</feed>
\ No newline at end of file
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index c48635c..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<MSDeploy.iisApp>
-    <iisapp path="ExpressStarter" />
-</MSDeploy.iisApp>
\ No newline at end of file
diff --git a/ExpressStarter/middleware/errorHandler.js b/middleware/errorHandler.js
similarity index 100%
rename from ExpressStarter/middleware/errorHandler.js
rename to middleware/errorHandler.js
diff --git a/ExpressStarter/middleware/locals.js b/middleware/locals.js
similarity index 100%
rename from ExpressStarter/middleware/locals.js
rename to middleware/locals.js
diff --git a/node32.png b/node32.png
deleted file mode 100644
index 2cb34e3..0000000
Binary files a/node32.png and /dev/null differ
diff --git a/ExpressStarter/package.json b/package.json
similarity index 100%
rename from ExpressStarter/package.json
rename to package.json
diff --git a/parameters.xml b/parameters.xml
deleted file mode 100644
index 34303ea..0000000
--- a/parameters.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<parameters>
-  <parameter name="Parameter 1" description="Full site path where you want to install 
-          your application (for example, ExpressStarter/Application)." defaultValue="ExpressStarter" tags="IisApp">
-    <parameterEntry kind="ProviderPath" scope="iisApp" match="ExpressStarter" />
-  </parameter>
-</parameters>
\ No newline at end of file
diff --git a/ExpressStarter/public/images/NuGetGallery.png b/public/images/NuGetGallery.png
similarity index 100%
rename from ExpressStarter/public/images/NuGetGallery.png
rename to public/images/NuGetGallery.png
diff --git a/ExpressStarter/public/images/accent.png b/public/images/accent.png
similarity index 100%
rename from ExpressStarter/public/images/accent.png
rename to public/images/accent.png
diff --git a/ExpressStarter/public/images/aspNetHome.png b/public/images/aspNetHome.png
similarity index 100%
rename from ExpressStarter/public/images/aspNetHome.png
rename to public/images/aspNetHome.png
diff --git a/ExpressStarter/public/images/bullet.png b/public/images/bullet.png
similarity index 100%
rename from ExpressStarter/public/images/bullet.png
rename to public/images/bullet.png
diff --git a/ExpressStarter/public/images/facebook.png b/public/images/facebook.png
similarity index 100%
rename from ExpressStarter/public/images/facebook.png
rename to public/images/facebook.png
diff --git a/ExpressStarter/public/images/findHosting.png b/public/images/findHosting.png
similarity index 100%
rename from ExpressStarter/public/images/findHosting.png
rename to public/images/findHosting.png
diff --git a/ExpressStarter/public/images/heroAccent.png b/public/images/heroAccent.png
similarity index 100%
rename from ExpressStarter/public/images/heroAccent.png
rename to public/images/heroAccent.png
diff --git a/ExpressStarter/public/images/heroAccent2.png b/public/images/heroAccent2.png
similarity index 100%
rename from ExpressStarter/public/images/heroAccent2.png
rename to public/images/heroAccent2.png
diff --git a/ExpressStarter/public/images/orderedListOne.png b/public/images/orderedListOne.png
similarity index 100%
rename from ExpressStarter/public/images/orderedListOne.png
rename to public/images/orderedListOne.png
diff --git a/ExpressStarter/public/images/orderedListThree.png b/public/images/orderedListThree.png
similarity index 100%
rename from ExpressStarter/public/images/orderedListThree.png
rename to public/images/orderedListThree.png
diff --git a/ExpressStarter/public/images/orderedListTwo.png b/public/images/orderedListTwo.png
similarity index 100%
rename from ExpressStarter/public/images/orderedListTwo.png
rename to public/images/orderedListTwo.png
diff --git a/ExpressStarter/public/images/twitter.png b/public/images/twitter.png
similarity index 100%
rename from ExpressStarter/public/images/twitter.png
rename to public/images/twitter.png
diff --git a/ExpressStarter/public/images/windowsLive.png b/public/images/windowsLive.png
similarity index 100%
rename from ExpressStarter/public/images/windowsLive.png
rename to public/images/windowsLive.png
diff --git a/ExpressStarter/public/javascripts/chat.js b/public/javascripts/chat.js
similarity index 100%
rename from ExpressStarter/public/javascripts/chat.js
rename to public/javascripts/chat.js
diff --git a/ExpressStarter/public/javascripts/jquery-1.7.min.js b/public/javascripts/jquery-1.7.min.js
similarity index 100%
rename from ExpressStarter/public/javascripts/jquery-1.7.min.js
rename to public/javascripts/jquery-1.7.min.js
diff --git a/ExpressStarter/public/jquery-mobile/images/ajax-loader.png b/public/jquery-mobile/images/ajax-loader.png
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/images/ajax-loader.png
rename to public/jquery-mobile/images/ajax-loader.png
diff --git a/ExpressStarter/public/jquery-mobile/images/icons-18-black.png b/public/jquery-mobile/images/icons-18-black.png
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/images/icons-18-black.png
rename to public/jquery-mobile/images/icons-18-black.png
diff --git a/ExpressStarter/public/jquery-mobile/images/icons-18-white.png b/public/jquery-mobile/images/icons-18-white.png
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/images/icons-18-white.png
rename to public/jquery-mobile/images/icons-18-white.png
diff --git a/ExpressStarter/public/jquery-mobile/images/icons-36-black.png b/public/jquery-mobile/images/icons-36-black.png
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/images/icons-36-black.png
rename to public/jquery-mobile/images/icons-36-black.png
diff --git a/ExpressStarter/public/jquery-mobile/images/icons-36-white.png b/public/jquery-mobile/images/icons-36-white.png
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/images/icons-36-white.png
rename to public/jquery-mobile/images/icons-36-white.png
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.css b/public/jquery-mobile/jquery.mobile-1.0rc3.css
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.css
rename to public/jquery-mobile/jquery.mobile-1.0rc3.css
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.js b/public/jquery-mobile/jquery.mobile-1.0rc3.js
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.js
rename to public/jquery-mobile/jquery.mobile-1.0rc3.js
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.min.css b/public/jquery-mobile/jquery.mobile-1.0rc3.min.css
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.min.css
rename to public/jquery-mobile/jquery.mobile-1.0rc3.min.css
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.min.js b/public/jquery-mobile/jquery.mobile-1.0rc3.min.js
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.min.js
rename to public/jquery-mobile/jquery.mobile-1.0rc3.min.js
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.structure.min.css b/public/jquery-mobile/jquery.mobile-1.0rc3.structure.min.css
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile-1.0rc3.structure.min.css
rename to public/jquery-mobile/jquery.mobile-1.0rc3.structure.min.css
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile.structure-1.0rc3.css b/public/jquery-mobile/jquery.mobile.structure-1.0rc3.css
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile.structure-1.0rc3.css
rename to public/jquery-mobile/jquery.mobile.structure-1.0rc3.css
diff --git a/ExpressStarter/public/jquery-mobile/jquery.mobile.structure-1.0rc3.min.css b/public/jquery-mobile/jquery.mobile.structure-1.0rc3.min.css
similarity index 100%
rename from ExpressStarter/public/jquery-mobile/jquery.mobile.structure-1.0rc3.min.css
rename to public/jquery-mobile/jquery.mobile.structure-1.0rc3.min.css
diff --git a/ExpressStarter/public/stylesheets/chat.css b/public/stylesheets/chat.css
similarity index 100%
rename from ExpressStarter/public/stylesheets/chat.css
rename to public/stylesheets/chat.css
diff --git a/ExpressStarter/public/stylesheets/chat.less b/public/stylesheets/chat.less
similarity index 100%
rename from ExpressStarter/public/stylesheets/chat.less
rename to public/stylesheets/chat.less
diff --git a/ExpressStarter/public/stylesheets/style.css b/public/stylesheets/style.css
similarity index 100%
rename from ExpressStarter/public/stylesheets/style.css
rename to public/stylesheets/style.css
diff --git a/ExpressStarter/public/stylesheets/style.less b/public/stylesheets/style.less
similarity index 100%
rename from ExpressStarter/public/stylesheets/style.less
rename to public/stylesheets/style.less
diff --git a/ExpressStarter/robots.txt b/robots.txt
similarity index 100%
rename from ExpressStarter/robots.txt
rename to robots.txt
diff --git a/ExpressStarter/routes/account.js b/routes/account.js
similarity index 100%
rename from ExpressStarter/routes/account.js
rename to routes/account.js
diff --git a/ExpressStarter/routes/global.js b/routes/global.js
similarity index 100%
rename from ExpressStarter/routes/global.js
rename to routes/global.js
diff --git a/ExpressStarter/routes/home.js b/routes/home.js
similarity index 100%
rename from ExpressStarter/routes/home.js
rename to routes/home.js
diff --git a/ExpressStarter/server.js b/server.js
similarity index 100%
rename from ExpressStarter/server.js
rename to server.js
diff --git a/ExpressStarter/views/about.jade b/views/about.jade
similarity index 100%
rename from ExpressStarter/views/about.jade
rename to views/about.jade
diff --git a/ExpressStarter/views/account/account.jade b/views/account/account.jade
similarity index 100%
rename from ExpressStarter/views/account/account.jade
rename to views/account/account.jade
diff --git a/ExpressStarter/views/account/login.jade b/views/account/login.jade
similarity index 100%
rename from ExpressStarter/views/account/login.jade
rename to views/account/login.jade
diff --git a/ExpressStarter/views/chat.jade b/views/chat.jade
similarity index 100%
rename from ExpressStarter/views/chat.jade
rename to views/chat.jade
diff --git a/ExpressStarter/views/errors/404.jade b/views/errors/404.jade
similarity index 100%
rename from ExpressStarter/views/errors/404.jade
rename to views/errors/404.jade
diff --git a/ExpressStarter/views/errors/500.jade b/views/errors/500.jade
similarity index 100%
rename from ExpressStarter/views/errors/500.jade
rename to views/errors/500.jade
diff --git a/ExpressStarter/views/index.jade b/views/index.jade
similarity index 100%
rename from ExpressStarter/views/index.jade
rename to views/index.jade
diff --git a/ExpressStarter/views/layout.jade b/views/layout.jade
similarity index 100%
rename from ExpressStarter/views/layout.jade
rename to views/layout.jade
diff --git a/ExpressStarter/views/layout_mobile.jade b/views/layout_mobile.jade
similarity index 100%
rename from ExpressStarter/views/layout_mobile.jade
rename to views/layout_mobile.jade
diff --git a/ExpressStarter/web.config b/web.config
similarity index 100%
rename from ExpressStarter/web.config
rename to web.config