Moved stuff inside a component
Fixed fold