Added rest of the modules. Started work on report repository. Refactored.