Fix directory and makefile generation
Fix directory and makefile generation
Fix directory and makefile generation