Revert "Moved account methods to accountmapper"

This reverts commit 17670fe60c193e4ef515570a95398cc4cd03ffdd.
Revert "Revert "Moved account methods to accountmapper""

This reverts commit b65df4fcbace07368c86972b43ba5ac6ce32cfb6.