#500 resolved. Create modules and refactoring names.