fixed import path and dir placement

moved dir model under data, refactored util_test.py