Fixes on directories and Makefile, 2nd part