Restructured the maven modules