diff --git a/setter/CMakeLists.txt b/setter/CMakeLists.txt
index 035d70a..4d1e0cc 100644
--- a/setter/CMakeLists.txt
+++ b/setter/CMakeLists.txt
@@ -3,4 +3,4 @@ project(setter C)
 
 set(CMAKE_C_STANDARD 90)
 
-add_executable(setter consts.h defs.h main.h dosos2.h os2_16.h os2_32.h main.c dos.c os2_16.c os2_32.c win32.c win32.h unix.c macos.c macos.h unix.h linux.c linux.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.c src/macos.c src/macos.h src/unix.h src/linux.c src/linux.h)
\ No newline at end of file
diff --git a/setter/._consts.h b/setter/src/._consts.h
similarity index 100%
rename from setter/._consts.h
rename to setter/src/._consts.h
diff --git a/setter/._defs.h b/setter/src/._defs.h
similarity index 100%
rename from setter/._defs.h
rename to setter/src/._defs.h
diff --git a/setter/._dos.c b/setter/src/._dos.c
similarity index 100%
rename from setter/._dos.c
rename to setter/src/._dos.c
diff --git a/setter/._dos.h b/setter/src/._dos.h
similarity index 100%
rename from setter/._dos.h
rename to setter/src/._dos.h
diff --git a/setter/._dosos2.h b/setter/src/._dosos2.h
similarity index 100%
rename from setter/._dosos2.h
rename to setter/src/._dosos2.h
diff --git a/setter/._macos.c b/setter/src/._macos.c
similarity index 100%
rename from setter/._macos.c
rename to setter/src/._macos.c
diff --git a/setter/._macos.h b/setter/src/._macos.h
similarity index 100%
rename from setter/._macos.h
rename to setter/src/._macos.h
diff --git a/setter/._macos.r b/setter/src/._macos.r
similarity index 100%
rename from setter/._macos.r
rename to setter/src/._macos.r
diff --git a/setter/._main.c b/setter/src/._main.c
similarity index 100%
rename from setter/._main.c
rename to setter/src/._main.c
diff --git a/setter/._main.h b/setter/src/._main.h
similarity index 100%
rename from setter/._main.h
rename to setter/src/._main.h
diff --git a/setter/._os2_16.c b/setter/src/._os2_16.c
similarity index 100%
rename from setter/._os2_16.c
rename to setter/src/._os2_16.c
diff --git a/setter/._os2_16.h b/setter/src/._os2_16.h
similarity index 100%
rename from setter/._os2_16.h
rename to setter/src/._os2_16.h
diff --git a/setter/._os2_32.h b/setter/src/._os2_32.h
similarity index 100%
rename from setter/._os2_32.h
rename to setter/src/._os2_32.h
diff --git a/setter/._unix.c b/setter/src/._unix.c
similarity index 100%
rename from setter/._unix.c
rename to setter/src/._unix.c
diff --git a/setter/._win32.c b/setter/src/._win32.c
similarity index 100%
rename from setter/._win32.c
rename to setter/src/._win32.c
diff --git a/setter/consts.h b/setter/src/consts.h
similarity index 100%
rename from setter/consts.h
rename to setter/src/consts.h
diff --git a/setter/defs.h b/setter/src/defs.h
similarity index 100%
rename from setter/defs.h
rename to setter/src/defs.h
diff --git a/setter/dos.c b/setter/src/dos.c
similarity index 100%
rename from setter/dos.c
rename to setter/src/dos.c
diff --git a/setter/dos.h b/setter/src/dos.h
similarity index 100%
rename from setter/dos.h
rename to setter/src/dos.h
diff --git a/setter/dosos2.h b/setter/src/dosos2.h
similarity index 100%
rename from setter/dosos2.h
rename to setter/src/dosos2.h
diff --git a/setter/linux.c b/setter/src/linux.c
similarity index 100%
rename from setter/linux.c
rename to setter/src/linux.c
diff --git a/setter/linux.h b/setter/src/linux.h
similarity index 100%
rename from setter/linux.h
rename to setter/src/linux.h
diff --git a/setter/macos.c b/setter/src/macos.c
similarity index 100%
rename from setter/macos.c
rename to setter/src/macos.c
diff --git a/setter/macos.h b/setter/src/macos.h
similarity index 100%
rename from setter/macos.h
rename to setter/src/macos.h
diff --git a/setter/macos.r b/setter/src/macos.r
similarity index 100%
rename from setter/macos.r
rename to setter/src/macos.r
diff --git a/setter/main.c b/setter/src/main.c
similarity index 100%
rename from setter/main.c
rename to setter/src/main.c
diff --git a/setter/main.h b/setter/src/main.h
similarity index 100%
rename from setter/main.h
rename to setter/src/main.h
diff --git a/setter/os2_16.c b/setter/src/os2_16.c
similarity index 100%
rename from setter/os2_16.c
rename to setter/src/os2_16.c
diff --git a/setter/os2_16.h b/setter/src/os2_16.h
similarity index 100%
rename from setter/os2_16.h
rename to setter/src/os2_16.h
diff --git a/setter/os2_32.c b/setter/src/os2_32.c
similarity index 100%
rename from setter/os2_32.c
rename to setter/src/os2_32.c
diff --git a/setter/os2_32.h b/setter/src/os2_32.h
similarity index 100%
rename from setter/os2_32.h
rename to setter/src/os2_32.h
diff --git a/setter/unix.c b/setter/src/unix.c
similarity index 100%
rename from setter/unix.c
rename to setter/src/unix.c
diff --git a/setter/unix.h b/setter/src/unix.h
similarity index 100%
rename from setter/unix.h
rename to setter/src/unix.h
diff --git a/setter/win32.c b/setter/src/win32.c
similarity index 99%
rename from setter/win32.c
rename to setter/src/win32.c
index 1b085ca..1ee064b 100644
--- a/setter/win32.c
+++ b/setter/src/win32.c
@@ -39,10 +39,10 @@ Copyright (C) 2011-2020 Natalia Portillo
 #include "consts.h"
 #include "defs.h"
 
+#include <Windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <windows.h>
 
 void GetOsInfo()
 {
diff --git a/setter/win32.h b/setter/src/win32.h
similarity index 100%
rename from setter/win32.h
rename to setter/src/win32.h