Moved several classes to J-stores.