reorganize directories for tests