D312: Change inner module to only import classes/methods as needed

D312: Change inner module to only import classes/methods as needed #818