Renamed classes and methods related to moving feeds into/out of folders, for better readability.