More refactoring to split off the content directory