Separated out files and worked on wallet bugs