Fixed sink bug - multiple bucket filling.

Minor package renaming.