Cleanup of unused classes and added Factory pattern for module creation
Merge branch 'master' of https://github.com/marvineffing/DesignPatterns