Makefile correction and rawdata-procedures modification after comments about structure
Merge rawdata-procedures