Created makefile & fixed layout