Revert "Renaming some old files"

This reverts commit 65d44feb5a6db5008e6acdc09a9e9bca322a68c0.