Update to Maven

Update to Maven (Hopefully)