This commit: removed some files, which were re-named.
This commit: re-added renamed files.