Reorganizing the maven project