#116 Reorganize Maven Modules