diff --git a/Makefile b/Makefile
index 6386c3b6a..47cad3e62 100644
--- a/Makefile
+++ b/Makefile
@@ -321,7 +321,7 @@ install: all
 	$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
 	$(INSTALL) -c -m 644 $(wildcard $(srcdir)/docs/graphics/*.png) "$(DESTDIR)$(DOCDIR)/graphics"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/applications"
-	$(INSTALL) -c -m 644 "$(srcdir)/src/unix/stella.desktop" "$(DESTDIR)$(DATADIR)/applications"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/os/unix/stella.desktop" "$(DESTDIR)$(DATADIR)/applications"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps"
@@ -357,7 +357,7 @@ src/emucore/M6502.ins: src/emucore/M6502.m4
 	m4 src/emucore/M6502.m4 > src/emucore/M6502.ins
 
 # Special rule for windows icon stuff (there's probably a better way to do this ...)
-src/windows/stella_icon.o: src/windows/stella.ico src/windows/stella.rc
-	windres --include-dir src/windows src/windows/stella.rc src/windows/stella_icon.o
+src/os/windows/stella_icon.o: src/os/windows/stella.ico src/os/windows/stella.rc
+	windres --include-dir src/os/windows src/os/windows/stella.rc src/os/windows/stella_icon.o
 
 .PHONY: deb bundle test install uninstall
diff --git a/debian/copyright b/debian/copyright
index 91ea3e49a..926631d63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -73,7 +73,7 @@ License: RSA
  These notices must be retained in any copies of any part of this
  documentation and/or software.
 
-Files: src/libpng/*
+Files: src/lib/libpng/*
 Copyright: 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 	   1996-1997 Andreas Dilger
 	   1998-2013 Glenn Randers-Pehrson
@@ -112,7 +112,7 @@ License: libpng
  risk of satisfactory quality, performance, accuracy, and effort is
  with the user.
 
-Files: src/libretro/libretro.h
+Files: src/os/libretro/libretro.h
 Copyright: 2010-2017 The RetroArch team
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
@@ -135,7 +135,7 @@ License: MIT
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: src/macos/*
+Files: src/os/macos/*
 Copyright: 2005-2006 Mark Grebe
 License: GPL-2+
 
@@ -164,7 +164,7 @@ License: GPL-2
  License version 2 can be found in
  `/usr/share/common-licenses/GPL-2'.
 
-Files: src/zlib/*
+Files: src/lib/zlib/*
 Copyright: 1995-2012, 2016 Jean-loup Gailly and Mark Adler
 License: zlib
  This software is provided 'as-is', without any express or implied
diff --git a/src/os/unix/r77/module.mk b/src/os/unix/r77/module.mk
index 821c26c91..95463ddbc 100644
--- a/src/os/unix/r77/module.mk
+++ b/src/os/unix/r77/module.mk
@@ -1,11 +1,11 @@
-MODULE := src/unix/r77
+MODULE := src/os/unix/r77
 
 MODULE_OBJS := \
-	src/unix/r77/OSystemR77.o \
-	src/unix/r77/SettingsR77.o
+	src/os/unix/r77/OSystemR77.o \
+	src/os/unix/r77/SettingsR77.o
 
 MODULE_DIRS += \
-	src/unix/r77
+	src/os/unix/r77
 
 # Include common rules
 include $(srcdir)/common.rules