Fix makefile and structure folders