Renamed files to make their roles more obvious