diff --git a/CHANGELOG b/CHANGELOG.txt
similarity index 100%
rename from CHANGELOG
rename to CHANGELOG.txt
diff --git a/LICENSE b/LICENSE.txt
similarity index 100%
rename from LICENSE
rename to LICENSE.txt
diff --git a/README b/README.txt
similarity index 100%
rename from README
rename to README.txt
diff --git a/examples/network_server/README b/examples/network_server/README.txt
similarity index 100%
rename from examples/network_server/README
rename to examples/network_server/README.txt
diff --git a/examples/simple/README b/examples/simple/README.txt
similarity index 100%
rename from examples/simple/README
rename to examples/simple/README.txt
diff --git a/examples/using_double_on_avr/README b/examples/using_double_on_avr/README.txt
similarity index 100%
rename from examples/using_double_on_avr/README
rename to examples/using_double_on_avr/README.txt
diff --git a/examples/using_union_messages/README b/examples/using_union_messages/README.txt
similarity index 100%
rename from examples/using_union_messages/README
rename to examples/using_union_messages/README.txt
diff --git a/cmake/FindNanopb.cmake b/extra/FindNanopb.cmake
similarity index 98%
rename from cmake/FindNanopb.cmake
rename to extra/FindNanopb.cmake
index ad96b5c..c804e70 100644
--- a/cmake/FindNanopb.cmake
+++ b/extra/FindNanopb.cmake
@@ -1,4 +1,5 @@
-# Locate and configure the nanopb library.
+# This is an example script for use with CMake projects for locating and configuring
+# the nanopb library.
 #
 # The following varialbes have to be set:
 #
diff --git a/compat/pb_syshdr.h b/extra/pb_syshdr.h
similarity index 97%
rename from compat/pb_syshdr.h
rename to extra/pb_syshdr.h
index b69a167..b9a97a4 100644
--- a/compat/pb_syshdr.h
+++ b/extra/pb_syshdr.h
@@ -1,7 +1,7 @@
 /* This is an example of a header file for platforms/compilers that do
  * not come with stdint.h/stddef.h/stdbool.h/string.h. To use it, define
  * PB_SYSTEM_HEADER as "pb_syshdr.h", including the quotes, and add the
- * compat folder to your include path.
+ * extra folder to your include path.
  *
  * It is very likely that you will need to customize this file to suit
  * your platform. For any compiler that supports C99, this file should