Directory restructure.
Merge pull request #40 from dwhswenson/directory_restructure

Directory restructure.