[IMP] Moved unported modules back, fixed relative imports for modules targeted for migration & other fixes