Working directory and clean up

This commit includes the working version of the site.