Reorganize folders to prepare for tests.