Test 2 after directory restructure