Changed directory structure.

I didn't like how the directories were laid out, so I changed them.