remove mtgox cruft; reorganize a bit