Further changes moving modules to core.