Refactor buckets to be non-components