Updated organization of content