Removed two old versions of the site, simplify directory structure