refactored pom files and cleaned up