Refactoring the modules to make more sense for unit tests
Update the code to look at new module structure