Fixing build, mavenizing dependencies

@vnivargi