change directory construction and makefile