restructured Maven layout