Second part of the big refactor. Migrating all of the relevant method bodies to their respective translation units.