merged account management into one file