Moved IIResidenceStore components to correct location.