diff --git a/02-sub-projects/A-basic/README.adoc b/02-sub-projects/A-basic/README.adoc
index fd623e7..3031891 100644
--- a/02-sub-projects/A-basic/README.adoc
+++ b/02-sub-projects/A-basic/README.adoc
@@ -25,24 +25,40 @@ $ tree
 │   └── main.cpp
 ├── sublibrary1
 │   ├── CMakeLists.txt
-│   ├── inc
-│   │   └── sublib1.h
+│   ├── include
+│   │   └── sublib1
+│   │       └── sublib1.h
 │   └── src
 │       └── sublib1.cpp
 └── sublibrary2
     ├── CMakeLists.txt
-    └── inc
-        └── sublib2.h
+    └── include
+        └── sublib2
+            └── sublib2.h
 ```
 
   * link:CMakeLists.txt[] - Top level CMakeLists.txt
   * link:subbinary/CMakeLists.txt[] - to make the executable
   * link:subbinary/main.cpp[] - source for the executable
   * link:sublibrary1/CMakeLists.txt[] - to make a static library
-  * link:sublibrary1/inc/sublib1.h[]
+  * link:sublibrary1/include/sublib1/sublib1.h[]
   * link:sublibrary1/src/sublib2.cpp[]
   * link:sublibrary2/CMakeLists.txt[] - to setup header only library
-  * link:sublibrary2/inc/sublib2.h[]
+  * link:sublibrary2/include/sublib2/sublib2.h[]
+
+[TIP]
+====
+In this example I have moved the header files to a subfolder under each projects +include+
+directory, while leaving the target include as the root +include+ folder. This is a good idea to prevent 
+filename clashes because you have to include a file like below:
+[source,cpp]
+----
+#include "sublib1/sublib1.h"
+----
+
+This also means that if you install your library for other users the default install location would be
++/usr/local/include/sublib1/sublib1.h+.
+====
 
 # Concepts
 
@@ -114,7 +130,7 @@ that link this target but not in the complation of the target itself.
 ----
 target_include_directories(${PROJECT_NAME}
     INTERFACE
-        ${PROJECT_SOURCE_DIR}/inc
+        ${PROJECT_SOURCE_DIR}/include
 )
 ----
 
diff --git a/02-sub-projects/A-basic/subbinary/CMakeLists.txt b/02-sub-projects/A-basic/subbinary/CMakeLists.txt
index 5fcbf9d..1269b9b 100644
--- a/02-sub-projects/A-basic/subbinary/CMakeLists.txt
+++ b/02-sub-projects/A-basic/subbinary/CMakeLists.txt
@@ -9,14 +9,8 @@ add_executable(${PROJECT_NAME} ${SOURCES})
 
 # Link the static library from subproject1 using it's alias sub::lib1
 # Link the header only library from subproject2 using it's alias sub::lib2
+# This will cause the include directories for that target to be added to this project
 target_link_libraries(${PROJECT_NAME}
     sub::lib1
     sub::lib2
 )
-
-# Include the inc directories from the sub projects
-include_directories( ${PROJECT_NAME}
-    PRIVATE
-    ${sublibrary1_SOURCE_DIR}/inc
-    ${sublibrary2_SOURCE_DIR}/inc
-)
diff --git a/02-sub-projects/A-basic/subbinary/main.cpp b/02-sub-projects/A-basic/subbinary/main.cpp
index 64d660c..4219c5e 100644
--- a/02-sub-projects/A-basic/subbinary/main.cpp
+++ b/02-sub-projects/A-basic/subbinary/main.cpp
@@ -1,5 +1,5 @@
-#include "sublib1.h"
-#include "sublib2.h"
+#include "sublib1/sublib1.h"
+#include "sublib2/sublib2.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/02-sub-projects/A-basic/sublibrary1/CMakeLists.txt b/02-sub-projects/A-basic/sublibrary1/CMakeLists.txt
index 23d035f..82b06d9 100644
--- a/02-sub-projects/A-basic/sublibrary1/CMakeLists.txt
+++ b/02-sub-projects/A-basic/sublibrary1/CMakeLists.txt
@@ -10,6 +10,6 @@ set(SOURCES
 add_library(${PROJECT_NAME} ${SOURCES})
 add_library(sub::lib1 ALIAS ${PROJECT_NAME})
 
-include_directories( ${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/inc
+target_include_directories( ${PROJECT_NAME}
+    PUBLIC ${PROJECT_SOURCE_DIR}/include
 )
diff --git a/02-sub-projects/A-basic/sublibrary1/inc/sublib1.h b/02-sub-projects/A-basic/sublibrary1/include/sublib1/sublib1.h
similarity index 100%
rename from 02-sub-projects/A-basic/sublibrary1/inc/sublib1.h
rename to 02-sub-projects/A-basic/sublibrary1/include/sublib1/sublib1.h
diff --git a/02-sub-projects/A-basic/sublibrary1/src/sublib1.cpp b/02-sub-projects/A-basic/sublibrary1/src/sublib1.cpp
index 2edf0c1..633d00d 100644
--- a/02-sub-projects/A-basic/sublibrary1/src/sublib1.cpp
+++ b/02-sub-projects/A-basic/sublibrary1/src/sublib1.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "sublib1.h"
+#include "sublib1/sublib1.h"
 
 void sublib1::print()
 {
diff --git a/02-sub-projects/A-basic/sublibrary2/CMakeLists.txt b/02-sub-projects/A-basic/sublibrary2/CMakeLists.txt
index b9aed13..c9c98ce 100644
--- a/02-sub-projects/A-basic/sublibrary2/CMakeLists.txt
+++ b/02-sub-projects/A-basic/sublibrary2/CMakeLists.txt
@@ -6,5 +6,5 @@ add_library(sub::lib2 ALIAS ${PROJECT_NAME})
 
 target_include_directories(${PROJECT_NAME}
     INTERFACE
-        ${PROJECT_SOURCE_DIR}/inc
+        ${PROJECT_SOURCE_DIR}/include
 )
diff --git a/02-sub-projects/A-basic/sublibrary2/inc/sublib2.h b/02-sub-projects/A-basic/sublibrary2/include/sublib2/sublib2.h
similarity index 100%
rename from 02-sub-projects/A-basic/sublibrary2/inc/sublib2.h
rename to 02-sub-projects/A-basic/sublibrary2/include/sublib2/sublib2.h