Finally converted to maven