Moved activeServer control to UserProfile; improved server-add mechanism
updated comments and formatting; rearranged packages