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