Rolled back to old db structure, refefactored usernamedb in favor of userdb.
merged.