diff --git a/include/exodusIIcpp.h b/include/exodusIIcpp.h
deleted file mode 100644
index 9f262e8..0000000
--- a/include/exodusIIcpp.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include "exodusIIcppElementBlock.h"
-#include "exodusIIcppEnums.h"
-#include "exodusIIcppError.h"
-#include "exodusIIcppException.h"
-#include "exodusIIcppFile.h"
-#include "exodusIIcppFilesystem.h"
-#include "exodusIIcppNodeSet.h"
-#include "exodusIIcppSideSet.h"
diff --git a/include/exodusIIcppElementBlock.h b/include/exodusIIcpp/element_block.h
similarity index 100%
rename from include/exodusIIcppElementBlock.h
rename to include/exodusIIcpp/element_block.h
diff --git a/include/exodusIIcppEnums.h b/include/exodusIIcpp/enums.h
similarity index 100%
rename from include/exodusIIcppEnums.h
rename to include/exodusIIcpp/enums.h
diff --git a/include/exodusIIcppError.h b/include/exodusIIcpp/error.h
similarity index 94%
rename from include/exodusIIcppError.h
rename to include/exodusIIcpp/error.h
index 6f5c2c8..eff5674 100644
--- a/include/exodusIIcppError.h
+++ b/include/exodusIIcpp/error.h
@@ -5,7 +5,7 @@
 
 #include "fmt/format.h"
 #include "fmt/printf.h"
-#include "exodusIIcppException.h"
+#include "exception.h"
 
 #define EXODUSIICPP_CHECK_ERROR(err) \
     exodusIIcpp::internal::check_error(err, __PRETTY_FUNCTION__, __FILE__, __LINE__)
diff --git a/include/exodusIIcppException.h b/include/exodusIIcpp/exception.h
similarity index 100%
rename from include/exodusIIcppException.h
rename to include/exodusIIcpp/exception.h
diff --git a/include/exodusIIcpp/exodusIIcpp.h b/include/exodusIIcpp/exodusIIcpp.h
new file mode 100644
index 0000000..261c4ae
--- /dev/null
+++ b/include/exodusIIcpp/exodusIIcpp.h
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "element_block.h"
+#include "enums.h"
+#include "error.h"
+#include "exception.h"
+#include "file.h"
+#include "filesystem.h"
+#include "node_set.h"
+#include "side_set.h"
diff --git a/include/exodusIIcppFile.h b/include/exodusIIcpp/file.h
similarity index 98%
rename from include/exodusIIcppFile.h
rename to include/exodusIIcpp/file.h
index 2ba8776..12333b1 100644
--- a/include/exodusIIcppFile.h
+++ b/include/exodusIIcpp/file.h
@@ -5,12 +5,12 @@
 
 #include <vector>
 #include <map>
-#include "exodusIIcppElementBlock.h"
-#include "exodusIIcppEnums.h"
-#include "exodusIIcppError.h"
-#include "exodusIIcppNodeSet.h"
-#include "exodusIIcppSideSet.h"
-#include "exodusIIcppFilesystem.h"
+#include "element_block.h"
+#include "enums.h"
+#include "error.h"
+#include "node_set.h"
+#include "side_set.h"
+#include "filesystem.h"
 
 namespace exodusIIcpp {
 
diff --git a/include/exodusIIcppFilesystem.h b/include/exodusIIcpp/filesystem.h
similarity index 100%
rename from include/exodusIIcppFilesystem.h
rename to include/exodusIIcpp/filesystem.h
diff --git a/include/exodusIIcppNodeSet.h b/include/exodusIIcpp/node_set.h
similarity index 100%
rename from include/exodusIIcppNodeSet.h
rename to include/exodusIIcpp/node_set.h
diff --git a/include/exodusIIcppSideSet.h b/include/exodusIIcpp/side_set.h
similarity index 100%
rename from include/exodusIIcppSideSet.h
rename to include/exodusIIcpp/side_set.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d408e3b..ccc6b6b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_library(
     ${PROJECT_NAME}
     ${EXODUSIICPP_LIBRARY_TYPE}
-        exodusIIcppElementBlock.cpp
-        exodusIIcppException.cpp
-        exodusIIcppFile.cpp
-        exodusIIcppNodeSet.cpp
-        exodusIIcppSideSet.cpp
+        element_block.cpp
+        exception.cpp
+        file.cpp
+        node_set.cpp
+        side_set.cpp
 )
 if(CMAKE_PROJECT_NAME STREQUAL "exodusIIcpp")
     target_code_coverage(${PROJECT_NAME})
@@ -23,9 +23,10 @@ set_target_properties(
 target_include_directories(
     ${PROJECT_NAME}
     PUBLIC
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
         $<INSTALL_INTERFACE:include>
     PRIVATE
+        ${PROJECT_SOURCE_DIR}/include
         $<BUILD_INTERFACE:${EXODUSII_INCLUDE_DIR}>
         $<BUILD_INTERFACE:${NETCDF_INCLUDE_DIRS}>
 )
@@ -65,7 +66,7 @@ install(
 
 install(
     DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exodusIIcpp
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
 )
 
diff --git a/src/exodusIIcppElementBlock.cpp b/src/element_block.cpp
similarity index 95%
rename from src/exodusIIcppElementBlock.cpp
rename to src/element_block.cpp
index eb8622f..0ba9c84 100644
--- a/src/exodusIIcppElementBlock.cpp
+++ b/src/element_block.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
 // SPDX-License-Identifier: MIT
 
-#include "exodusIIcppElementBlock.h"
-#include "exodusIIcppException.h"
+#include "exodusIIcpp/element_block.h"
+#include "exodusIIcpp/exception.h"
 
 namespace exodusIIcpp {
 
diff --git a/src/exodusIIcppException.cpp b/src/exception.cpp
similarity index 89%
rename from src/exodusIIcppException.cpp
rename to src/exception.cpp
index e7a08f6..bfa8ffe 100644
--- a/src/exodusIIcppException.cpp
+++ b/src/exception.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
 // SPDX-License-Identifier: MIT
 
-#include "exodusIIcppException.h"
+#include "exodusIIcpp/exception.h"
 
 namespace exodusIIcpp {
 
diff --git a/src/exodusIIcppFile.cpp b/src/file.cpp
similarity index 99%
rename from src/exodusIIcppFile.cpp
rename to src/file.cpp
index b291c25..722c92a 100644
--- a/src/exodusIIcppFile.cpp
+++ b/src/file.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
 // SPDX-License-Identifier: MIT
 
-#include "exodusIIcppFile.h"
+#include "exodusIIcpp/file.h"
 #include "exodusII.h"
 #include "fmt/printf.h"
 #include <cassert>
diff --git a/src/exodusIIcppNodeSet.cpp b/src/node_set.cpp
similarity index 92%
rename from src/exodusIIcppNodeSet.cpp
rename to src/node_set.cpp
index 0dbb6e1..e988e1f 100644
--- a/src/exodusIIcppNodeSet.cpp
+++ b/src/node_set.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
 // SPDX-License-Identifier: MIT
 
-#include "exodusIIcppNodeSet.h"
-#include "exodusIIcppException.h"
+#include "exodusIIcpp/node_set.h"
+#include "exodusIIcpp/exception.h"
 
 namespace exodusIIcpp {
 
diff --git a/src/exodusIIcppSideSet.cpp b/src/side_set.cpp
similarity index 95%
rename from src/exodusIIcppSideSet.cpp
rename to src/side_set.cpp
index 62e1375..59e9d37 100644
--- a/src/exodusIIcppSideSet.cpp
+++ b/src/side_set.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2022 David Andrs <andrsd@gmail.com>
 // SPDX-License-Identifier: MIT
 
-#include "exodusIIcppSideSet.h"
-#include "exodusIIcppException.h"
+#include "exodusIIcpp/side_set.h"
+#include "exodusIIcpp/exception.h"
 
 namespace exodusIIcpp {
 
diff --git a/test/ElementBlock_test.cpp b/test/ElementBlock_test.cpp
index 8818695..42f43e8 100644
--- a/test/ElementBlock_test.cpp
+++ b/test/ElementBlock_test.cpp
@@ -1,5 +1,5 @@
 #include "gmock/gmock.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 
 using namespace exodusIIcpp;
 
diff --git a/test/Error_test.cpp b/test/Error_test.cpp
index 4f8a116..facc7e2 100644
--- a/test/Error_test.cpp
+++ b/test/Error_test.cpp
@@ -1,5 +1,5 @@
 #include "gmock/gmock.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 
 using namespace exodusIIcpp;
 
diff --git a/test/File_test.cpp b/test/File_test.cpp
index beae547..b5eac13 100644
--- a/test/File_test.cpp
+++ b/test/File_test.cpp
@@ -1,5 +1,5 @@
 #include "gmock/gmock.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 #include "config.h"
 
 using namespace exodusIIcpp;
diff --git a/test/NodeSet_test.cpp b/test/NodeSet_test.cpp
index 2db5963..bfb8a5b 100644
--- a/test/NodeSet_test.cpp
+++ b/test/NodeSet_test.cpp
@@ -1,5 +1,5 @@
 #include "gmock/gmock.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 #include <stdexcept>
 
 using namespace exodusIIcpp;
diff --git a/test/SideSet_test.cpp b/test/SideSet_test.cpp
index c6ff254..c0940c6 100644
--- a/test/SideSet_test.cpp
+++ b/test/SideSet_test.cpp
@@ -1,5 +1,5 @@
 #include "gmock/gmock.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 #include <stdexcept>
 
 using namespace exodusIIcpp;
diff --git a/tools/exo2yml/main.cpp b/tools/exo2yml/main.cpp
index 887f902..7bcddf8 100644
--- a/tools/exo2yml/main.cpp
+++ b/tools/exo2yml/main.cpp
@@ -1,7 +1,7 @@
 #include "cxxopts/cxxopts.hpp"
 #include "fmt/printf.h"
 #include "yaml-cpp/yaml.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 #include <fstream>
 
 exodusIIcpp::File
diff --git a/tools/yml2exo/main.cpp b/tools/yml2exo/main.cpp
index 4c45baf..5c121dd 100644
--- a/tools/yml2exo/main.cpp
+++ b/tools/yml2exo/main.cpp
@@ -1,7 +1,7 @@
 #include "cxxopts/cxxopts.hpp"
 #include "fmt/printf.h"
 #include "yaml-cpp/yaml.h"
-#include "exodusIIcpp.h"
+#include "exodusIIcpp/exodusIIcpp.h"
 #include "common/error.h"
 
 YAML::Node