Revised directory structure.
Revise directory structure.
Merge pull request #1 from martensm/master

Revised directory structure.