Import classes into mixin package as it doesn't cause circular import issue anymore