Remove unused files
Rename State -> Buckets
Tiny bit of restructuring