Restructured test folders