Move the redraw mapping.

Move the mapping back into core. Move the loading of core above the
AddMapping function.