Organized feed controller
Removed troubled dir
merged