- DONE: refactor: align bucket and items structure