Started refactoring.
Refactored component factory view.