refactor(Legacy): Cleanup imports, move classes where they belong and disable failing find() tests.