further class library file movement