better xml hierarchy and name simplification
util to convert from 006 to 007
cleanup and metas