a little more clean up, import mapping files in new way (cleaner) but chaged order in all.maps list, so watch out...