Moved O.vol to core and added location for primary