Restructure marketplace.

Another experimental restructuring of the client. This is not merge ready. This is only for review and for getting more ideas.

Previously, I submitted a PR which also had changes to restructure this project - #28.

This looks more solid to me and therefore I went ahead and did more work in this direction. So, ideas please? :)