Shuffling around some files and tests and refactorings and whatnot.