Rearrange features. Add `private-messages` feature