Remove a lot of extra code; rename the verticle package