Removed unnecessary classes. Significantly changed handlers and feeds.