Moved the included base module in models to avoid namespace collisions