Refactoring a bunch of code.

Removed some unnecessary files. Drastically shrunk
others. Moved one. The moved file is currently unused
but is something I'd like to add at some point.

Change-Id: I22dc75e841d2e6685081fa1d428152887055fc93
12 files changed