Move content to support new modular diddleman