Modularize

ok this should work now.

requires: https://github.com/opentechinstitute/commotion-feed/pull/10

tested and works