Restructure directories and files.
Feature parity after directory restructuring.
Merge pull request #12 from keighty/directory_restructure

Directory restructure