giza: top level reorganization
giza: fixing imports for post-top-level reorganization
giza: fixes to makefile for new giza