Revert "Revert "Moved Account Class""

This reverts commit ee355088db156def177fbbfb2356dce4f5395374.