Change content folder hierarchy and add content