diff --git a/test/source/scwx/wsr88d/rpg/ar2v_file.test.cpp b/test/source/scwx/wsr88d/ar2v_file.test.cpp
similarity index 82%
rename from test/source/scwx/wsr88d/rpg/ar2v_file.test.cpp
rename to test/source/scwx/wsr88d/ar2v_file.test.cpp
index f97c65cf..c5920f68 100644
--- a/test/source/scwx/wsr88d/rpg/ar2v_file.test.cpp
+++ b/test/source/scwx/wsr88d/ar2v_file.test.cpp
@@ -1,4 +1,4 @@
-#include <scwx/wsr88d/rpg/ar2v_file.hpp>
+#include <scwx/wsr88d/ar2v_file.hpp>
 
 #include <fstream>
 
@@ -8,8 +8,6 @@ namespace scwx
 {
 namespace wsr88d
 {
-namespace rpg
-{
 
 TEST(ar2v_file, klsx)
 {
@@ -21,6 +19,5 @@ TEST(ar2v_file, klsx)
    EXPECT_EQ(fileValid, true);
 }
 
-} // namespace rpg
 } // namespace wsr88d
 } // namespace scwx
diff --git a/test/source/scwx/wxtest.cpp b/test/source/scwx/wxtest.cpp
index 34d03d6f..3bb34268 100644
--- a/test/source/scwx/wxtest.cpp
+++ b/test/source/scwx/wxtest.cpp
@@ -1,7 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <boost/log/expressions.hpp>
+#include <boost/log/trivial.hpp>
+
 int main(int argc, char** argv)
 {
+   boost::log::core::get()->set_filter(boost::log::trivial::severity >=
+                                       boost::log::trivial::debug);
+
    ::testing::InitGoogleTest(&argc, argv);
    return RUN_ALL_TESTS();
 }
diff --git a/test/test.cmake b/test/test.cmake
index 1ceabc67..c344548b 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -9,15 +9,15 @@ find_package(GTest)
 
 set(SRC_MAIN source/scwx/wxtest.cpp)
 set(SRC_UTIL_TESTS source/scwx/util/rangebuf.test.cpp)
-set(SRC_WSR88D_RPG_TESTS source/scwx/wsr88d/rpg/ar2v_file.test.cpp)
+set(SRC_WSR88D_TESTS source/scwx/wsr88d/ar2v_file.test.cpp)
 
 add_executable(wxtest ${SRC_MAIN}
                       ${SRC_UTIL_TESTS}
-                      ${SRC_WSR88D_RPG_TESTS})
+                      ${SRC_WSR88D_TESTS})
 
-source_group("Source Files\\main"        FILES ${SRC_MAIN})
-source_group("Source Files\\util"        FILES ${SRC_UTIL_TESTS})
-source_group("Source Files\\wsr88d\\rpg" FILES ${SRC_WSR88D_RPG_TESTS})
+source_group("Source Files\\main"   FILES ${SRC_MAIN})
+source_group("Source Files\\util"   FILES ${SRC_UTIL_TESTS})
+source_group("Source Files\\wsr88d" FILES ${SRC_WSR88D_TESTS})
 
 target_include_directories(wxtest PRIVATE ${GTest_INCLUDE_DIRS})
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/ar2v_file.hpp b/wxdata/include/scwx/wsr88d/ar2v_file.hpp
similarity index 95%
rename from wxdata/include/scwx/wsr88d/rpg/ar2v_file.hpp
rename to wxdata/include/scwx/wsr88d/ar2v_file.hpp
index 2f682ee5..105ecd9a 100644
--- a/wxdata/include/scwx/wsr88d/rpg/ar2v_file.hpp
+++ b/wxdata/include/scwx/wsr88d/ar2v_file.hpp
@@ -7,8 +7,6 @@ namespace scwx
 {
 namespace wsr88d
 {
-namespace rpg
-{
 
 class Ar2vFileImpl;
 
@@ -35,6 +33,5 @@ private:
    std::unique_ptr<Ar2vFileImpl> p;
 };
 
-} // namespace rpg
 } // namespace wsr88d
 } // namespace scwx
diff --git a/wxdata/source/scwx/wsr88d/rpg/ar2v_file.cpp b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
similarity index 97%
rename from wxdata/source/scwx/wsr88d/rpg/ar2v_file.cpp
rename to wxdata/source/scwx/wsr88d/ar2v_file.cpp
index f3202cae..4c8f5544 100644
--- a/wxdata/source/scwx/wsr88d/rpg/ar2v_file.cpp
+++ b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
@@ -1,4 +1,4 @@
-#include <scwx/wsr88d/rpg/ar2v_file.hpp>
+#include <scwx/wsr88d/ar2v_file.hpp>
 #include <scwx/wsr88d/rda/message_header.hpp>
 #include <scwx/util/rangebuf.hpp>
 
@@ -20,10 +20,8 @@ namespace scwx
 {
 namespace wsr88d
 {
-namespace rpg
-{
 
-static const std::string logPrefix_ = "[scwx::wsr88d::rpg::ar2v_file] ";
+static const std::string logPrefix_ = "[scwx::wsr88d::ar2v_file] ";
 
 class Ar2vFileImpl
 {
@@ -215,6 +213,5 @@ void Ar2vFileImpl::ParseLDMRecords()
    }
 }
 
-} // namespace rpg
 } // namespace wsr88d
 } // namespace scwx
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index 3335dd05..f9299613 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -4,24 +4,24 @@ find_package(Boost)
 
 set(HDR_UTIL include/scwx/util/rangebuf.hpp)
 set(SRC_UTIL source/scwx/util/rangebuf.cpp)
-set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/ar2v_file.hpp)
-set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ar2v_file.cpp)
+set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp)
+set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp)
 set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/message_header.hpp)
 set(SRC_WSR88D_RDA source/scwx/wsr88d/rda/message_header.cpp)
 
 add_library(wxdata OBJECT ${HDR_UTIL}
                           ${SRC_UTIL}
+                          ${HDR_WSR88D}
+                          ${SRC_WSR88D}
                           ${HDR_WSR88D_RDA}
-                          ${SRC_WSR88D_RDA}
-                          ${HDR_WSR88D_RPG}
-                          ${SRC_WSR88D_RPG})
+                          ${SRC_WSR88D_RDA})
 
 source_group("Header Files\\util"        FILES ${HDR_UTIL})
 source_group("Source Files\\util"        FILES ${SRC_UTIL})
+source_group("Header Files\\wsr88d"      FILES ${HDR_WSR88D})
+source_group("Source Files\\wsr88d"      FILES ${SRC_WSR88D})
 source_group("Header Files\\wsr88d\\rda" FILES ${HDR_WSR88D_RDA})
 source_group("Source Files\\wsr88d\\rda" FILES ${SRC_WSR88D_RDA})
-source_group("Header Files\\wsr88d\\rpg" FILES ${HDR_WSR88D_RPG})
-source_group("Source Files\\wsr88d\\rpg" FILES ${SRC_WSR88D_RPG})
 
 target_include_directories(wxdata PRIVATE ${Boost_INCLUDE_DIR}
                                           ${scwx-data_SOURCE_DIR}/include