trying to introduce a new convention so that mapping and definition are at one place

... made sure some missed are now working but this is still a lot of work to be done!

Author: kares