Moved account to avp\account.class