WIP: Start breaking codebase up.