diff --git a/bid_request_test.go b/bid_request_test.go
index 8b55478..c22b5b1 100644
--- a/bid_request_test.go
+++ b/bid_request_test.go
@@ -30,27 +30,27 @@ var _ = Describe("BidRequest", func() {
 
 		Entry(
 			"Simple Banner",
-			"bid-request-simple-banner.json",
+			"bid-request/simple-banner.json",
 			new(BidRequest)),
 		Entry(
 			"Expandable Creative",
-			"bid-request-expandable-creative.json",
+			"bid-request/expandable-creative.json",
 			new(BidRequest)),
 		Entry(
 			"Mobile",
-			"bid-request-mobile.json",
+			"bid-request/mobile.json",
 			new(BidRequest)),
 		Entry(
 			"Video",
-			"bid-request-video.json",
+			"bid-request/video.json",
 			new(BidRequest)),
 		Entry(
 			"PMP with Direct Deal",
-			"bid-request-pmp-with-direct-deal.json",
+			"bid-request/pmp-with-direct-deal.json",
 			new(BidRequest)),
 		Entry(
 			"Native Ad",
-			"bid-request-native-ad.json",
+			"bid-request/native-ad.json",
 			new(BidRequest)),
 	)
 })
diff --git a/bid_response_test.go b/bid_response_test.go
index c19b495..e2bc236 100644
--- a/bid_response_test.go
+++ b/bid_response_test.go
@@ -30,19 +30,19 @@ var _ = Describe("BidResponse", func() {
 
 		Entry(
 			"Ad Served on Win Notice",
-			"bid-response-ad-served-on-win-notice.json",
+			"bid-response/ad-served-on-win-notice.json",
 			new(BidResponse)),
 		Entry(
 			"VAST XML Document Returned Inline",
-			"bid-response-vast-xml-document-returned-inline.json",
+			"bid-response/vast-xml-document-returned-inline.json",
 			new(BidResponse)),
 		Entry(
 			"Direct Deal Ad Served on Win Notice",
-			"bid-response-direct-deal-ad-served-on-win-notice.json",
+			"bid-response/direct-deal-ad-served-on-win-notice.json",
 			new(BidResponse)),
 		Entry(
 			"Native Markup Returned Inline",
-			"bid-response-native-markup-returned-inline.json",
+			"bid-response/native-markup-returned-inline.json",
 			new(BidResponse)),
 	)
 })
diff --git a/testdata/bid-request-expandable-creative.json b/testdata/bid-request/expandable-creative.json
similarity index 100%
rename from testdata/bid-request-expandable-creative.json
rename to testdata/bid-request/expandable-creative.json
diff --git a/testdata/bid-request-mobile.json b/testdata/bid-request/mobile.json
similarity index 100%
rename from testdata/bid-request-mobile.json
rename to testdata/bid-request/mobile.json
diff --git a/testdata/bid-request-native-ad.json b/testdata/bid-request/native-ad.json
similarity index 100%
rename from testdata/bid-request-native-ad.json
rename to testdata/bid-request/native-ad.json
diff --git a/testdata/bid-request-pmp-with-direct-deal.json b/testdata/bid-request/pmp-with-direct-deal.json
similarity index 100%
rename from testdata/bid-request-pmp-with-direct-deal.json
rename to testdata/bid-request/pmp-with-direct-deal.json
diff --git a/testdata/bid-request-simple-banner.json b/testdata/bid-request/simple-banner.json
similarity index 100%
rename from testdata/bid-request-simple-banner.json
rename to testdata/bid-request/simple-banner.json
diff --git a/testdata/bid-request-video.json b/testdata/bid-request/video.json
similarity index 100%
rename from testdata/bid-request-video.json
rename to testdata/bid-request/video.json
diff --git a/testdata/bid-response-ad-served-on-win-notice.json b/testdata/bid-response/ad-served-on-win-notice.json
similarity index 100%
rename from testdata/bid-response-ad-served-on-win-notice.json
rename to testdata/bid-response/ad-served-on-win-notice.json
diff --git a/testdata/bid-response-direct-deal-ad-served-on-win-notice.json b/testdata/bid-response/direct-deal-ad-served-on-win-notice.json
similarity index 100%
rename from testdata/bid-response-direct-deal-ad-served-on-win-notice.json
rename to testdata/bid-response/direct-deal-ad-served-on-win-notice.json
diff --git a/testdata/bid-response-native-markup-returned-inline.json b/testdata/bid-response/native-markup-returned-inline.json
similarity index 100%
rename from testdata/bid-response-native-markup-returned-inline.json
rename to testdata/bid-response/native-markup-returned-inline.json
diff --git a/testdata/bid-response-vast-xml-document-returned-inline.json b/testdata/bid-response/vast-xml-document-returned-inline.json
similarity index 100%
rename from testdata/bid-response-vast-xml-document-returned-inline.json
rename to testdata/bid-response/vast-xml-document-returned-inline.json