Improve naming & resource locations
Clean up pom.xml files