Updated k-buckets to use a priority-map.
Minor refactoring to schemas.
Work in progress