More refactoring, module structure, more names