Reorganized directory to be more standard
Merge pull request #93 from akleeman/reorg-directories

Reorganized file layout to be more standard