Relatedly, how do I refactor my component tree?