makefile: fix project -> core dependencies + fix refactoring