Checkpoint of refactoring to multiple components