content pipeline updates

lots of stuff moved..