Cleaning up the folders a bit