Move structure stuff from OB