refactor: Pushed sharding one layer down in the architecture