Component: moving Component pieces into new type