Moved Component to own file