Initial work for sandbox reorganization
[WIP] Integrating migrator with tests.