Some more code prettifies have been done
Productengine has been eliminated from pom.xml