Changed classes and interfaces names, addded source and target to pom file, etc.