Renamed files to more suitable, removed files

Deleted feeds no longer used.