Consistency of module names enforced
Report generation refactoring started