move to /dev/data-modeling dir
add flag to map plus some other fixes
add flag to map plus some other fixes