re-added renamed files (missing from last commit)