A bunch of reorganization and cleaning, but no code changes