Fix more errors. 
Remove non-maven library and add it as maven dependency.