Move/rename some packages.  Add FriendType to prepare for local contact support.