restructured the directories a little bit