Switch to render props for renderCore in module wrapper

Cleaner and use hooks to prevent passing classes arround...