Follow-up to d1c3e67, actually adding files at their new locations.