Restructured Maven modules