Starting refactoring of modules structure