Added wspace processing back, refactored wspace and reftree and pop reprocessing, made pop overwrite in non-wspace, added offset from jenkins wspace