was added maven build , and some refactoring