Clean up the folder structure