Refactoring component to FOF