mattdrayer/data-module-cleanup: Keep models internal to data layer

@ziafazal @ormsbee -- moved leaky Django models back into data layer