moved some data storage stuff

might not be the right name (sData - s for storage) but I feel that all of this is distinctive from the match based temporary storage of the data modual