refactoring: redefining module structure