Large tidy up of site dir and file structure