reorganized directories in tests