diff --git a/xtldr2/CMakeLists.txt b/xtldr2/CMakeLists.txt
index 61ab57e..275b9ff 100644
--- a/xtldr2/CMakeLists.txt
+++ b/xtldr2/CMakeLists.txt
@@ -9,6 +9,10 @@ include_directories(
     ${EXECTOS_SOURCE_DIR}/sdk/xtdk
     ${XTLDR_SOURCE_DIR}/includes)
 
+# Specify list of library source code files
+list(APPEND LIBXTLDR_SOURCE
+    ${XTLDR_SOURCE_DIR}/library/modproto.c)
+
 # Specify list of source code files
 list(APPEND XTLDR_SOURCE
     ${XTLDR_SOURCE_DIR}/config.c
@@ -18,7 +22,6 @@ list(APPEND XTLDR_SOURCE
     ${XTLDR_SOURCE_DIR}/globals.c
     ${XTLDR_SOURCE_DIR}/hardware.c
     ${XTLDR_SOURCE_DIR}/memory.c
-    ${XTLDR_SOURCE_DIR}/modproto.c
     ${XTLDR_SOURCE_DIR}/protocol.c
     ${XTLDR_SOURCE_DIR}/shell.c
     ${XTLDR_SOURCE_DIR}/string.c
@@ -27,7 +30,7 @@ list(APPEND XTLDR_SOURCE
     ${XTLDR_SOURCE_DIR}/xtldr.c)
 
 # Link static XTLDR library
-add_library(libxtldr ${XTLDR_SOURCE})
+add_library(libxtldr ${LIBXTLDR_SOURCE})
 
 # Link bootloader executable
 add_executable(xtldr ${XTLDR_SOURCE})
diff --git a/xtldr2/modproto.c b/xtldr2/library/modproto.c
similarity index 98%
rename from xtldr2/modproto.c
rename to xtldr2/library/modproto.c
index a5b8a97..7bf441d 100644
--- a/xtldr2/modproto.c
+++ b/xtldr2/library/modproto.c
@@ -1,7 +1,7 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/modproto.c
+ * FILE:            xtldr/library/modproto.c
  * DESCRIPTION:     XT Boot Loader protocol support for XTLDR modules
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */