Tidy the folder structure up