Updated to not include currently unused dirs.
Updated Make templates, add config.h.in.