fixing issues with content editor and adjusting file structure