Fixed makefile to corespond to layout