Updating to use maven for builds