Restructured sample (testing) files