Restructured test directory