refactored maven modules, more concise naming