diff --git a/src/App.svelte b/src/App.svelte
index 8cadb32..c0bb5d4 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -6,7 +6,7 @@
     import UserProfile from "$lib/components/views/profile/UserProfile.svelte";
     import CreatePostModal from "$lib/components/CreateMeme.svelte";
     import Feed from "$lib/components/Feed.svelte";
-    import Explore from "$lib/components/Explore.svelte";
+    import Explore from "$lib/components/views/explore/Explore.svelte";
     import {
         Home as HomeIcon,
         Search,
@@ -26,7 +26,7 @@
         AvatarImage,
     } from "$lib/components/ui/avatar";
     import { Profile } from "$lib/ao/messegeFactory.svelte";
-    import LowerProfile from "$lib/components/LowerProfile.svelte";
+    import LowerProfile from "$lib/components/views/profile/LowerProfile.svelte";
 
     export let url = "";
 
diff --git a/src/lib/components/CreateMeme.svelte b/src/lib/components/CreateMeme.svelte
index 28fa481..df4f8e5 100644
--- a/src/lib/components/CreateMeme.svelte
+++ b/src/lib/components/CreateMeme.svelte
@@ -33,9 +33,9 @@
   function getExt(name: string) {
     let mimeType = mime.getType(name);
     let ext = mime.getExtension(mimeType);
-    console.log(name);
-    console.log(mimeType);
-    console.log(ext);
+    // console.log(name);
+    // console.log(mimeType);
+    // console.log(ext);
     return ext;
   }
 
diff --git a/src/lib/components/RepliesPage.svelte b/src/lib/components/RepliesPage.svelte
index b63c29e..eb02cfd 100644
--- a/src/lib/components/RepliesPage.svelte
+++ b/src/lib/components/RepliesPage.svelte
@@ -6,7 +6,7 @@
   import { Link } from "svelte-routing";
   import { Button } from "$lib/components/ui/button";
   import CreatePost from "$lib/components/CreateMeme.svelte";
-  import SwapTransactions from "$lib/components/SwapTransaction.svelte";
+  import SwapTransactions from "$lib/components/views/swap/SwapTransaction.svelte";
   import * as Tabs from "$lib/components/ui/tabs";
   export let memeId: string;
 
diff --git a/src/lib/components/Explore.svelte b/src/lib/components/views/explore/Explore.svelte
similarity index 95%
rename from src/lib/components/Explore.svelte
rename to src/lib/components/views/explore/Explore.svelte
index 94e33b9..0d1243d 100644
--- a/src/lib/components/Explore.svelte
+++ b/src/lib/components/views/explore/Explore.svelte
@@ -18,11 +18,11 @@
     TrendingUp,
   } from "lucide-svelte";
   import type { Meme } from "$lib/models/Meme";
-  import { feedPosts } from "../../stores/feedpage.store";
+  import { feedPosts } from "../../../../stores/feedpage.store";
   import { fetchMemes } from "$lib/ao/mememaker";
-  import Pump from "./Pump.svelte";
-  import Dump from "./Dump.svelte";
-  import Spinner from "./Spinner.svelte";
+  import Pump from "../../Pump.svelte";
+  import Dump from "../../Dump.svelte";
+  import Spinner from "../../Spinner.svelte";
 
   let memes: Meme[] = [];
   let loading = true;
diff --git a/src/lib/components/LowerProfile.svelte b/src/lib/components/views/profile/LowerProfile.svelte
similarity index 94%
rename from src/lib/components/LowerProfile.svelte
rename to src/lib/components/views/profile/LowerProfile.svelte
index 50a8e66..72f2ac4 100644
--- a/src/lib/components/LowerProfile.svelte
+++ b/src/lib/components/views/profile/LowerProfile.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import { Avatar, AvatarFallback, AvatarImage } from "./ui/avatar";
+  import { Avatar, AvatarFallback, AvatarImage } from "../../ui/avatar";
   import { MoreHorizontal } from "lucide-svelte";
-  import { currentUser } from "../../stores/profile.store";
+  import { currentUser } from "../../../../stores/profile.store";
   import ConnectWalletButton from "$lib/components/wallet.svelte";
   import { navigate } from "svelte-routing";
 
diff --git a/src/lib/components/views/profile/UserProfile.svelte b/src/lib/components/views/profile/UserProfile.svelte
index 0ee41b5..e5f4226 100644
--- a/src/lib/components/views/profile/UserProfile.svelte
+++ b/src/lib/components/views/profile/UserProfile.svelte
@@ -36,6 +36,8 @@
 
   async function fetchEvents() {
     eventStore.setLoading(true);
+    // let events = ao.getEvents();
+    // eventsStore.set(events);
     try {
     } catch (err) {
     } finally {
diff --git a/src/lib/components/SwapTransaction.svelte b/src/lib/components/views/swap/SwapTransaction.svelte
similarity index 97%
rename from src/lib/components/SwapTransaction.svelte
rename to src/lib/components/views/swap/SwapTransaction.svelte
index aa6b8e8..aa1c5dd 100644
--- a/src/lib/components/SwapTransaction.svelte
+++ b/src/lib/components/views/swap/SwapTransaction.svelte
@@ -3,7 +3,7 @@
   import { formatDistanceToNow } from "date-fns";
   import { ArrowUpRight, ArrowDownRight } from "lucide-svelte";
   import { fetchSwaps } from "$lib/ao/mememaker";
-  import { swapsStore } from "../../stores/pool.store";
+  import { swapsStore } from "../../../../stores/pool.store";
   import type { Swap } from "$lib/models/Swap";
   import { DECIMALS, formatNumber } from "$lib/constants";
   import type { Meme } from "$lib/models/Meme";
diff --git a/src/stores/events.store.ts b/src/stores/events.store.ts
index 7ed8723..9685df7 100644
--- a/src/stores/events.store.ts
+++ b/src/stores/events.store.ts
@@ -13,14 +13,12 @@ export interface Event {
        sig: ""
 }
 
-// Define the structure of our event store
 interface EventStore {
        events: Event[];
        loading: boolean;
        error: string | null;
 }
 
-// Create the initial state
 const initialState: EventStore = {
        events: [],
        loading: false,
@@ -28,7 +26,6 @@ const initialState: EventStore = {
 };
 
 
-
 // Create the store
 function createEventStore() {
        const { subscribe, set, update } = writable<EventStore>(initialState);
diff --git a/src/stores/profile.store.ts b/src/stores/profile.store.ts
index 7d2938b..dd68e83 100644
--- a/src/stores/profile.store.ts
+++ b/src/stores/profile.store.ts
@@ -9,6 +9,7 @@ const anon = {
   Name: "anon",
   Creator: "anon",
 }
+
 export const currentUser = writable<Profile>(anon);
 export const profileMemes = writable<Meme[]>([]);