mavenizing
Refactoring - moving to packages
Compilable version