Project has been restructured for maven again