Refactor ItemManager to be the more bucket minded NubBucketManager.
Refactor NubBucketSource.