Consolidate designs into a single Figma file

Figma file here: https://www.figma.com/file/cp8vc8iIMtOvAt4MNm0N5z/Diagram-3?node-id=0%3A1