Fix Makefile

Fix breakage caused by change of layout