Changed directory structure.

I didn't like how the directories were laid out, so I changed them.
Merge pull request #1 from p1oooop/brandon-development

Changed directory structure.