Version bump to 3.6
Some refactorign. Also allow export paths to be specified.
3.6 build