cleaned up the folder structure