Content files refactor