More source files and additions to the ContentGen module