File reshuffling
Added makefile