Refactor so that Design has a single root component (which is a Group)