Moved Instantiator to classtools, and other fixes