Changed to maven build system