Reorganization in prep for refactoring.