removed deprecated moduled and fixed import error