Adjust content.areas to new modules