Restructuring make generator -- it's now working again, but dependencies aren't just yet.