Component refactoring in process, most done ...