Refactoring started. Created few modules.