Finalize conversion to Maven