Restructure the website.
fixing merge
merging branches iis a pain