add accounts class and refactor users class