Move common components to prefab