restructured content sources a wee bit