First steps towards using modules.
Start using modules.
Removed debug output.