Moved wallet creation to a new file

Also re-tabbed