Refactoring module names, cleaning