Fixed some issues with makefile and dirs