core: Initial rebarification of modules