[dist] refactor and bump]