clean up and pom.xml update
adding classes