Wallet Polishing

Some of the file constructions in the wallet were moved around. Some things were simplified. Compatibility with previous editions of the wallet 0.4.0 have been broken, this should be okay though because it was never officially released.

As of this PR, wallet is release-ready as far as I know. Could use a few more tests, but his should be merged asap.