Changed build system to maven