diff --git a/libyara/Makefile.am b/libyara/Makefile.am
index 8f318eb2..cbe4cac6 100644
--- a/libyara/Makefile.am
+++ b/libyara/Makefile.am
@@ -143,16 +143,16 @@ libyara_la_SOURCES = \
   utils.h
 
 if USE_WINDOWS_PROC
-libyara_la_SOURCES += proc_windows.c
+libyara_la_SOURCES += proc/windows.c
 endif
 if USE_LINUX_PROC
-libyara_la_SOURCES += proc_linux.c
+libyara_la_SOURCES += proc/linux.c
 endif
 if USE_MACH_PROC
-libyara_la_SOURCES += proc_mach.c
+libyara_la_SOURCES += proc/mach.c
 endif
 if USE_NO_PROC
-libyara_la_SOURCES += proc_none.c
+libyara_la_SOURCES += proc/none.c
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libyara/proc_linux.c b/libyara/proc/linux.c
similarity index 100%
rename from libyara/proc_linux.c
rename to libyara/proc/linux.c
diff --git a/libyara/proc_mach.c b/libyara/proc/mach.c
similarity index 100%
rename from libyara/proc_mach.c
rename to libyara/proc/mach.c
diff --git a/libyara/proc_none.c b/libyara/proc/none.c
similarity index 100%
rename from libyara/proc_none.c
rename to libyara/proc/none.c
diff --git a/libyara/proc_windows.c b/libyara/proc/windows.c
similarity index 100%
rename from libyara/proc_windows.c
rename to libyara/proc/windows.c
diff --git a/windows/vs2015/libyara/libyara.vcxproj b/windows/vs2015/libyara/libyara.vcxproj
index 09587767..0980b700 100644
--- a/windows/vs2015/libyara/libyara.vcxproj
+++ b/windows/vs2015/libyara/libyara.vcxproj
@@ -210,7 +210,7 @@
     <ClCompile Include="..\..\..\libyara\object.c" />
     <ClCompile Include="..\..\..\libyara\parser.c" />
     <ClCompile Include="..\..\..\libyara\proc.c" />
-    <ClCompile Include="..\..\..\libyara\proc_windows.c" />
+    <ClCompile Include="..\..\..\libyara\proc\windows.c" />
     <ClCompile Include="..\..\..\libyara\re.c" />
     <ClCompile Include="..\..\..\libyara\re_grammar.c" />
     <ClCompile Include="..\..\..\libyara\re_lexer.c" />