Source reorganization and cleanup.