modified pom and removed old classes
cleand up project
merged poms