Sync'ed the exported json file with the original XML mal
[#438] further cleaning and code refactoring

One bug left now (default z order is wrong)