Reworks submodule arrangement and imports
Merge pull request #10 from lukecampbell/master

Submodule reworking