reorganized dir tree and changed Makefile accordingly