Moving StoreEntry class into the correct place