Reorganization as maven modules