Initial modularization
Merge pull request #24 from resultsreturned/modular_completion

Initial modularization