change install dir to not be split into separate inst, fac, reg sub dirs.
fixed module macro calls and removed deprecated stubs.