Component revert

- Component rewriting will proceed in new branch "Component-Rewrite"