refactored accounts data structure