With Master plugin for Figma you can:
- Create components only after you need them
- Move main components to a different file
- Turn anything into a new component or attach to an existing one
... and preserve all overrides — all in a couple of clicks!