Moved some core libraries around.