Added and reorganized content