More adjustments for separating the content folder.