Merge pull request #77 from murrekatt/develop

Moved trade related stuff into own subdir.