More reorganization (remove stale files from scraps/)