Modularization complete

Modularization complete.  Adding new feeds should be simple now.