Refactored AccountService into two layers.