renamed packages; included extra source/resource folders in the pom;