Moved all data into one 'content' collection