Project restructured for maven support