Reorganize bucket module