More cleaning up of the base code. Introduce an instantiation .inst file.