move custom classes out of mapx

and some other stuff
Merge pull request #17 from btfou/master

move custom classes out of mapx