Another cleanup and reorganization.