diff --git a/src/bookmark.tsx b/src/bookmark.tsx
index 2f85cdd..9a1d325 100644
--- a/src/bookmark.tsx
+++ b/src/bookmark.tsx
@@ -26,8 +26,8 @@ export default function BookmarkCommand() {
         showToast(Toast.Style.Animated, "Loading bookmarks...");
         const newBookmarks = await apiServer.fetchBookmarks();
         setBookmarks(newBookmarks);
-        cache.set("latest_bookmarks", JSON.stringify(newBookmarks));
         showToast(Toast.Style.Success, "Bookmarked has been loaded");
+        cache.set("latest_bookmarks", JSON.stringify(newBookmarks));
       } catch (error) {
         const requestErr = error as AkkomaError;
         showToast(Toast.Style.Failure, "Error", requestErr.message);
diff --git a/src/api.ts b/src/utils/api.ts
similarity index 100%
rename from src/api.ts
rename to src/utils/api.ts
diff --git a/src/oauth.ts b/src/utils/oauth.ts
similarity index 100%
rename from src/oauth.ts
rename to src/utils/oauth.ts
diff --git a/src/types.ts b/src/utils/types.ts
similarity index 100%
rename from src/types.ts
rename to src/utils/types.ts