Rename container--thrasher to containers partial and bring in other container variants