1) Refactoring - Remove unnecessary classes 
2) Fix pom