Update project structure

Make a single top-level project structure, to simplify building the project for the eager participants on hackathon day.

This moves both projects to build under maven, puts them in a consistent package structure, and cleans up a few small issues.