Just finished a massive refactor. I feel cleansed.

192 files changed, 6902 insertions(+), 9130 deletions(-)