Migrating to new Store/Index module structure