Move to Maven, and basic cleanup