refactoring: clean module structure