reorganisation of code layout
Makefile tweaks
more makefile adaptation