clean up and new folder structure