commons: refactor package