diff --git a/setter/CMakeLists.txt b/setter/CMakeLists.txt
index 7c38f47..7de82fe 100644
--- a/setter/CMakeLists.txt
+++ b/setter/CMakeLists.txt
@@ -3,4 +3,4 @@ project(setter C)
 
 set(CMAKE_C_STANDARD 90)
 
-add_executable(setter src/consts.h src/defs.h src/main.h src/dosos2.h src/os2_16.h src/os2_32.h src/main.c src/dos.c src/os2_16.c src/os2_32.c src/win32.c src/win32.h src/unix.c src/macos.c src/macos.h src/unix.h src/linux.c src/linux.h src/netware.c src/netware.h)
\ No newline at end of file
+add_executable(setter src/consts.h src/defs.h src/main.h src/dosos2.h src/os2_16.h src/os2_32.h src/main.c src/dos.c src/os2_16.c src/os2_32.c src/win32.c src/win32.h src/unix/unix.c src/macos.c src/macos.h src/unix/unix.h src/linux/linux.c src/linux/linux.h src/netware.c src/netware.h)
\ No newline at end of file
diff --git a/setter/src/linux.c b/setter/src/linux/linux.c
similarity index 99%
rename from setter/src/linux.c
rename to setter/src/linux/linux.c
index a86d88c..ae75676 100644
--- a/setter/src/linux.c
+++ b/setter/src/linux/linux.c
@@ -31,20 +31,21 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
 
-#include "consts.h"
+#include "../consts.h"
 #define _GNU_SOURCE
-#include "linux.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <features.h>
-#include <linux/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
+#include "linux.h"
+
+#include <linux/fs.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #if((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) || (__GLIBC__ > 2)
 #include <sys/ioctl.h>
diff --git a/setter/src/linux.h b/setter/src/linux/linux.h
similarity index 100%
rename from setter/src/linux.h
rename to setter/src/linux/linux.h
diff --git a/setter/src/unix.c b/setter/src/unix/unix.c
similarity index 99%
rename from setter/src/unix.c
rename to setter/src/unix/unix.c
index dbaea73..46e5845 100644
--- a/setter/src/unix.c
+++ b/setter/src/unix/unix.c
@@ -31,12 +31,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
 
-#include "unix.h"
-
-#include "consts.h"
-#include "defs.h"
-#include "linux.h"
-
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -44,12 +38,19 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <utime.h>
+
+#include "unix.h"
+
+#include "../consts.h"
+#include "../defs.h"
+#include "../linux/linux.h"
+
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
-#include <unistd.h>
-#include <utime.h>
 
 void GetOsInfo()
 {
diff --git a/setter/src/unix.h b/setter/src/unix/unix.h
similarity index 100%
rename from setter/src/unix.h
rename to setter/src/unix/unix.h