Content directory rearranged