Made some classes internal.