Moved to maven for dependency management