Mavenified + removed unessesary dependency to commons.jar