Changed build system to Maven