diff --git a/filenames.gypi b/filenames.gypi
index abb114532106..f9e19550c89b 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -8,64 +8,64 @@
       'atom/browser/resources/mac/atom.icns',
     ],
     'js_sources': [
-      'atom/browser/api/lib/app.js',
-      'atom/browser/api/lib/auto-updater.js',
-      'atom/browser/api/lib/auto-updater/auto-updater-native.js',
-      'atom/browser/api/lib/auto-updater/auto-updater-win.js',
-      'atom/browser/api/lib/auto-updater/squirrel-update-win.js',
-      'atom/browser/api/lib/browser-window.js',
-      'atom/browser/api/lib/content-tracing.js',
-      'atom/browser/api/lib/dialog.js',
-      'atom/browser/api/lib/exports/electron.js',
-      'atom/browser/api/lib/global-shortcut.js',
-      'atom/browser/api/lib/ipc.js',
-      'atom/browser/api/lib/ipc-main.js',
-      'atom/browser/api/lib/menu.js',
-      'atom/browser/api/lib/menu-item.js',
-      'atom/browser/api/lib/navigation-controller.js',
-      'atom/browser/api/lib/power-monitor.js',
-      'atom/browser/api/lib/power-save-blocker.js',
-      'atom/browser/api/lib/protocol.js',
-      'atom/browser/api/lib/session.js',
-      'atom/browser/api/lib/screen.js',
-      'atom/browser/api/lib/tray.js',
-      'atom/browser/api/lib/web-contents.js',
-      'atom/browser/lib/chrome-extension.js',
-      'atom/browser/lib/desktop-capturer.js',
-      'atom/browser/lib/guest-view-manager.js',
-      'atom/browser/lib/guest-window-manager.js',
-      'atom/browser/lib/init.js',
-      'atom/browser/lib/objects-registry.js',
-      'atom/browser/lib/rpc-server.js',
-      'atom/common/api/lib/callbacks-registry.js',
-      'atom/common/api/lib/clipboard.js',
-      'atom/common/api/lib/crash-reporter.js',
-      'atom/common/api/lib/deprecate.js',
-      'atom/common/api/lib/deprecations.js',
-      'atom/common/api/lib/exports/electron.js',
-      'atom/common/api/lib/native-image.js',
-      'atom/common/api/lib/shell.js',
-      'atom/common/lib/init.js',
-      'atom/common/lib/reset-search-paths.js',
-      'atom/renderer/lib/chrome-api.js',
-      'atom/renderer/lib/init.js',
-      'atom/renderer/lib/inspector.js',
-      'atom/renderer/lib/override.js',
-      'atom/renderer/lib/web-view/guest-view-internal.js',
-      'atom/renderer/lib/web-view/web-view.js',
-      'atom/renderer/lib/web-view/web-view-attributes.js',
-      'atom/renderer/lib/web-view/web-view-constants.js',
-      'atom/renderer/api/lib/desktop-capturer.js',
-      'atom/renderer/api/lib/exports/electron.js',
-      'atom/renderer/api/lib/ipc.js',
-      'atom/renderer/api/lib/ipc-renderer.js',
-      'atom/renderer/api/lib/remote.js',
-      'atom/renderer/api/lib/screen.js',
-      'atom/renderer/api/lib/web-frame.js',
+      'lib/browser/api/app.js',
+      'lib/browser/api/auto-updater.js',
+      'lib/browser/api/auto-updater/auto-updater-native.js',
+      'lib/browser/api/auto-updater/auto-updater-win.js',
+      'lib/browser/api/auto-updater/squirrel-update-win.js',
+      'lib/browser/api/browser-window.js',
+      'lib/browser/api/content-tracing.js',
+      'lib/browser/api/dialog.js',
+      'lib/browser/api/exports/electron.js',
+      'lib/browser/api/global-shortcut.js',
+      'lib/browser/api/ipc.js',
+      'lib/browser/api/ipc-main.js',
+      'lib/browser/api/menu.js',
+      'lib/browser/api/menu-item.js',
+      'lib/browser/api/navigation-controller.js',
+      'lib/browser/api/power-monitor.js',
+      'lib/browser/api/power-save-blocker.js',
+      'lib/browser/api/protocol.js',
+      'lib/browser/api/session.js',
+      'lib/browser/api/screen.js',
+      'lib/browser/api/tray.js',
+      'lib/browser/api/web-contents.js',
+      'lib/browser/chrome-extension.js',
+      'lib/browser/desktop-capturer.js',
+      'lib/browser/guest-view-manager.js',
+      'lib/browser/guest-window-manager.js',
+      'lib/browser/init.js',
+      'lib/browser/objects-registry.js',
+      'lib/browser/rpc-server.js',
+      'lib/common/api/callbacks-registry.js',
+      'lib/common/api/clipboard.js',
+      'lib/common/api/crash-reporter.js',
+      'lib/common/api/deprecate.js',
+      'lib/common/api/deprecations.js',
+      'lib/common/api/exports/electron.js',
+      'lib/common/api/native-image.js',
+      'lib/common/api/shell.js',
+      'lib/common/init.js',
+      'lib/common/reset-search-paths.js',
+      'lib/renderer/chrome-api.js',
+      'lib/renderer/init.js',
+      'lib/renderer/inspector.js',
+      'lib/renderer/override.js',
+      'lib/renderer/web-view/guest-view-internal.js',
+      'lib/renderer/web-view/web-view.js',
+      'lib/renderer/web-view/web-view-attributes.js',
+      'lib/renderer/web-view/web-view-constants.js',
+      'lib/renderer/api/desktop-capturer.js',
+      'lib/renderer/api/exports/electron.js',
+      'lib/renderer/api/ipc.js',
+      'lib/renderer/api/ipc-renderer.js',
+      'lib/renderer/api/remote.js',
+      'lib/renderer/api/screen.js',
+      'lib/renderer/api/web-frame.js',
     ],
     'js2c_sources': [
-      'atom/common/lib/asar.js',
-      'atom/common/lib/asar_init.js',
+      'lib/common/asar.js',
+      'lib/common/asar_init.js',
     ],
     'lib_sources': [
       'atom/app/atom_content_client.cc',