cleanup obsolete dirs/files. fix model makefile template to define the SAFPLUS_MODEL_DIR and SAFPLUS_SRC_DIR variables
merge from origin