streamlined most of the class import facilities. Module declaration still needs attention