Generalizing the two strategy for feed generation. Renamed the classes and some packages.