diff --git a/web/src/App.js b/web/src/App.js
index 4acdb9e..2896642 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -29,10 +29,10 @@ function App() {
             <NavLink to="/" className="nav-link">
               Feeling luckly
             </NavLink>
-            <NavLink to="/search-files" className="nav-link">
+            <NavLink to="/files" className="nav-link">
               Files
             </NavLink>
-            <NavLink to="/search-folders" className="nav-link">
+            <NavLink to="/folders" className="nav-link">
               Folders
             </NavLink>
             <NavLink to="/manage" className="nav-link">
@@ -48,20 +48,20 @@ function App() {
               element={<GetRandomFiles setPlayingFile={setPlayingFile} />}
             />
             <Route
-              path="/search-files"
+              path="/files"
               element={<SearchFiles setPlayingFile={setPlayingFile} />}
             />
             <Route
-              path="/search-folders"
+              path="/folders"
               element={<SearchFolders setPlayingFile={setPlayingFile} />}
             />
             <Route
-              path="/search-folders/:id"
+              path="/folders/:id"
               element={<FilesInFolder setPlayingFile={setPlayingFile} />}
             />
             <Route path="/manage" element={<Manage />} />
             <Route
-              path="/share/:id"
+              path="/files/:id/share"
               element={<Share setPlayingFile={setPlayingFile} />}
             />
           </Routes>
diff --git a/web/src/component/AudioPlayer.js b/web/src/component/AudioPlayer.js
index b3b7603..32bf105 100644
--- a/web/src/component/AudioPlayer.js
+++ b/web/src/component/AudioPlayer.js
@@ -80,7 +80,7 @@ function AudioPlayer(props) {
 
           <button
             onClick={() =>
-              navigate(`search-folders/${props.playingFile.folder_id}`)
+              navigate(`/folders/${props.playingFile.folder_id}`)
             }
           >
             {props.playingFile.foldername}
diff --git a/web/src/component/FileDialog.js b/web/src/component/FileDialog.js
index 9960864..d167fb5 100644
--- a/web/src/component/FileDialog.js
+++ b/web/src/component/FileDialog.js
@@ -33,7 +33,7 @@ function FileDialog(props) {
       </button>
       <button
         onClick={() => {
-          navigate(`/share/${props.file.id}`);
+          navigate(`/files/${props.file.id}/share`);
           props.setShowStatus(false);
         }}
       >
diff --git a/web/src/component/FileEntry.js b/web/src/component/FileEntry.js
index b10a623..718b1e2 100644
--- a/web/src/component/FileEntry.js
+++ b/web/src/component/FileEntry.js
@@ -25,7 +25,7 @@ function FileEntry(props) {
       </td>
       <td
         className="clickable"
-        onClick={() => navigate(`/search-folders/${props.file.folder_id}`)}
+        onClick={() => navigate(`/folders/${props.file.folder_id}`)}
       >
         {props.file.foldername}
       </td>
diff --git a/web/src/component/FoldersTable.js b/web/src/component/FoldersTable.js
index 6b645ab..11ce14e 100644
--- a/web/src/component/FoldersTable.js
+++ b/web/src/component/FoldersTable.js
@@ -17,12 +17,12 @@ function FoldersTable(props) {
         {props.folders.map((folder) => (
           <tr key={folder.id}>
             <td
-              onClick={() => navigate(`/search-folders/${folder.id}`)}
+              onClick={() => navigate(`/folders/${folder.id}`)}
               className="clickable"
             >
               {folder.foldername}
             </td>
-            <td onClick={() => navigate(`/search-folders/${folder.id}`)}>
+            <td onClick={() => navigate(`/folders/${folder.id}`)}>
               <button>View</button>
             </td>
           </tr>