Massive directory restructuring.
Merge pull request #22 from matthewSorensen/restructure-directories

Massive directory restructuring.