Added package names to the classes, so they can be embedded more cleanly
into our existing code structure.