Small fixes on the Makefiles and directories.