Actually moving the files into the directories this time...
House cleaning