diff --git a/config-unix.mk b/config-unix.mk
index 2f58acf5..dadb394f 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -34,7 +34,7 @@ EV_CONFIG=config_sunos.h
 EIO_CONFIG=config_sunos.h
 CPPFLAGS += -Isrc/ares/config_sunos -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
 LINKFLAGS+=-lsocket -lnsl
-UV_OS_FILE=uv-sunos.c
+UV_OS_FILE=sunos.c
 endif
 
 ifeq (Darwin,$(uname_S))
@@ -42,7 +42,7 @@ EV_CONFIG=config_darwin.h
 EIO_CONFIG=config_darwin.h
 CPPFLAGS += -Isrc/ares/config_darwin
 LINKFLAGS+=-framework CoreServices
-UV_OS_FILE=uv-darwin.c
+UV_OS_FILE=darwin.c
 endif
 
 ifeq (Linux,$(uname_S))
@@ -51,7 +51,7 @@ EIO_CONFIG=config_linux.h
 CSTDFLAG += -D_XOPEN_SOURCE=600
 CPPFLAGS += -Isrc/ares/config_linux
 LINKFLAGS+=-lrt
-UV_OS_FILE=uv-linux.c
+UV_OS_FILE=linux.c
 endif
 
 ifeq (FreeBSD,$(uname_S))
@@ -59,7 +59,7 @@ EV_CONFIG=config_freebsd.h
 EIO_CONFIG=config_freebsd.h
 CPPFLAGS += -Isrc/ares/config_freebsd
 LINKFLAGS+=
-UV_OS_FILE=uv-freebsd.c
+UV_OS_FILE=freebsd.c
 endif
 
 ifneq (,$(findstring CYGWIN,$(uname_S)))
@@ -69,7 +69,7 @@ EIO_CONFIG=config_cygwin.h
 CSTDFLAG = -D_GNU_SOURCE
 CPPFLAGS += -Isrc/ares/config_cygwin
 LINKFLAGS+=
-UV_OS_FILE=uv-cygwin.c
+UV_OS_FILE=cygwin.c
 endif
 
 # Need _GNU_SOURCE for strdup?
@@ -89,8 +89,8 @@ uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/ev/ev.o
 	$(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/unix/uv-eio.o src/ev/ev.o \
 		src/unix/eio/eio.o $(CARES_OBJS)
 
-src/uv-platform.o: src/$(UV_OS_FILE) include/uv.h include/uv-unix.h
-	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/$(UV_OS_FILE) -o src/uv-platform.o
+src/uv-platform.o: src/unix/$(UV_OS_FILE) include/uv.h include/uv-unix.h
+	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/unix/$(UV_OS_FILE) -o src/uv-platform.o
 
 src/uv-unix.o: src/uv-unix.c include/uv.h include/uv-unix.h src/unix/internal.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc  $(CFLAGS) -c src/uv-unix.c -o src/uv-unix.o
diff --git a/src/uv-cygwin.c b/src/unix/cygwin.c
similarity index 100%
rename from src/uv-cygwin.c
rename to src/unix/cygwin.c
diff --git a/src/uv-darwin.c b/src/unix/darwin.c
similarity index 100%
rename from src/uv-darwin.c
rename to src/unix/darwin.c
diff --git a/src/uv-freebsd.c b/src/unix/freebsd.c
similarity index 100%
rename from src/uv-freebsd.c
rename to src/unix/freebsd.c
diff --git a/src/uv-linux.c b/src/unix/linux.c
similarity index 100%
rename from src/uv-linux.c
rename to src/unix/linux.c
diff --git a/src/uv-sunos.c b/src/unix/sunos.c
similarity index 100%
rename from src/uv-sunos.c
rename to src/unix/sunos.c
diff --git a/uv.gyp b/uv.gyp
index 1723f695..7af90623 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -181,7 +181,7 @@
         }],
         [ 'OS=="mac"', {
           'include_dirs': [ 'src/ares/config_darwin' ],
-          'sources': [ 'src/uv-darwin.c' ],
+          'sources': [ 'src/unix/darwin.c' ],
           'direct_dependent_settings': {
             'libraries': [ '-framework CoreServices' ],
           },
@@ -192,7 +192,7 @@
         }],
         [ 'OS=="linux"', {
           'include_dirs': [ 'src/ares/config_linux' ],
-          'sources': [ 'src/uv-linux.c' ],
+          'sources': [ 'src/unix/linux.c' ],
           'defines': [
             'EV_CONFIG_H="config_linux.h"',
             'EIO_CONFIG_H="config_linux.h"',