Continue refactoring source files into logical units.