Begin modularization
Refactoring code organization
Including submodules
add groupEntry controller