Complete tidy of site strucutre