Reorganized maven project