Cleaning up the directories a bit