Changed the directories to make more sense...