Move some components to core/helpers