Minor makefile misstake corrected
More moving (files)
Misc