Moving to Maven for easier development