Changed Formatting
Renamed files to use new convention.
Changed pom.xml
Modified pom.xml