Finishing conversion to maven