Rewrite graphics section and general rewrites and file renamings to match Day 2 rewrites