Ktheory reorganization; Makefile improvement