changed to maven. updated few classes according to latest depedency jars