Slight composing Makefile and rearrange files