Rearrange packages, refactor frame and tab, add containers