Add new source files, and remove options inappropriate for subsidiary