Working data move test
Linting fixes
Renamed files