diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a1aa8d..5a110ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,8 +75,8 @@ add_subdirectory(src)
 #                             INSTALL                               #
 #///////////////////////////////////////////////////////////////////#
 
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/"
-  DESTINATION include FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+  DESTINATION include FILES_MATCHING PATTERN "nvtop/*.h")
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
diff --git a/README.markdown b/README.markdown
index 67aded6..967d144 100644
--- a/README.markdown
+++ b/README.markdown
@@ -19,7 +19,7 @@ Three libraries are required:
 * The NVIDIA Management Library (NVML).
   * This queries the GPU for information.
 * The ncurses library driving the user interface.
-  * This drives the screen.
+  * This makes the screen look beautiful.
 
 Limitations
 -----------
@@ -58,6 +58,6 @@ None for the moment.
 License
 -------
 
-Nvtop is licensed under the GPLV3 licence or any later version.
+Nvtop is licensed under the GPLV3 license or any later version.
 You will find a copy of the license inside the COPYING file of the repository or
 at the gnu website <[www.gnu.org/licenses/](http://www.gnu.org/licenses/)>.
diff --git a/include/extract_gpuinfo.h b/include/nvtop/extract_gpuinfo.h
similarity index 100%
rename from include/extract_gpuinfo.h
rename to include/nvtop/extract_gpuinfo.h
diff --git a/include/get_process_info.h b/include/nvtop/get_process_info.h
similarity index 100%
rename from include/get_process_info.h
rename to include/nvtop/get_process_info.h
diff --git a/include/interface.h b/include/nvtop/interface.h
similarity index 97%
rename from include/interface.h
rename to include/nvtop/interface.h
index 82b36e6..bd69c9b 100644
--- a/include/interface.h
+++ b/include/nvtop/interface.h
@@ -22,7 +22,7 @@
 #ifndef __INTERFACE_H_
 #define __INTERFACE_H_
 
-#include "extract_gpuinfo.h"
+#include "nvtop/extract_gpuinfo.h"
 
 enum sort_gpu_process_by {
   sort_pid,
diff --git a/src/extract_gpuinfo.c b/src/extract_gpuinfo.c
index c8fdcf1..c5017a8 100644
--- a/src/extract_gpuinfo.c
+++ b/src/extract_gpuinfo.c
@@ -19,12 +19,12 @@
  *
  */
 
-#include "extract_gpuinfo.h"
+#include "nvtop/extract_gpuinfo.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "get_process_info.h"
+#include "nvtop/get_process_info.h"
 
 static bool nvml_initialized = false;
 
diff --git a/src/get_process_info_linux.c b/src/get_process_info_linux.c
index 3974b60..6b44cdd 100644
--- a/src/get_process_info_linux.c
+++ b/src/get_process_info_linux.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include "get_process_info.h"
+#include "nvtop/get_process_info.h"
 
 #include <pwd.h>
 #include <stdio.h>
diff --git a/src/interface.c b/src/interface.c
index 06f4941..fdd8f97 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include "interface.h"
+#include "nvtop/interface.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/nvtop.c b/src/nvtop.c
index 037d71b..35421fe 100644
--- a/src/nvtop.c
+++ b/src/nvtop.c
@@ -27,7 +27,7 @@
 
 #include <locale.h>
 
-#include "interface.h"
+#include "nvtop/interface.h"
 
 #define STOP_SIGNAL 0x1
 #define RESIZE_SIGNAL 0x2