Overhaul of structure and content