Rearragned things, Edited output, added makefile