move directories, fix makefile