Revert last commit, do better namespacing instead.

This is the start of an attempt to better namespace things so that
classes we come up with are resuable throughout the app.