Revert "Changed Account Folders to Account2."

This reverts commit 5fe3bebc386a4450b39e2503bb8ff95b948cb6bf.