Changed a ton of stuff involving Maven
Changed a ton of stuff involving Maven