Fixing module loading so that it works with the new project structure
Disabling module loading via command until I can sit down and fix it
Merge pull request #36 from johnduhart/reorg

Reorg II: Bugfixes