tidies up the folder structure