Rearrange packages and classes