Moved CurrentDeviceList and CurrentUserList to Tools