Change groupId to com.lukespragg, and update and cleanup