fixed package structure. added context references to storage classes.