Tidy up folder structure