Add feature diptych with new wrappers.
Add feature diptych with new wrappers. Add rest of the files.