Reorganize account files and code