diff --git a/app/tabs/calorie.tsx b/app/tabs/calorie.tsx
index cb1236b..86bd68d 100644
--- a/app/tabs/calorie.tsx
+++ b/app/tabs/calorie.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { H5, Input, ScrollView, Tabs, Text } from "tamagui";
 
-import { CardDemo } from "../../components/DemoCard";
+import { CardDemo } from "../../components/calorie/DemoCard";
 import { MySafeAreaView } from "../../components/MySafeAreaView";
 import { MyStack } from "../../components/MyStack";
 import config from "../../env.json";
diff --git a/app/tabs/home.tsx b/app/tabs/home.tsx
index 768186d..bcf14cb 100644
--- a/app/tabs/home.tsx
+++ b/app/tabs/home.tsx
@@ -1,214 +1,11 @@
 import React, { useState } from "react";
-import { Animated, StyleSheet } from "react-native";
-import { FlatList, RectButton, Swipeable } from "react-native-gesture-handler";
-import { MaterialCommunityIcons } from "@expo/vector-icons";
-import { Trash } from "@tamagui/lucide-icons";
-import { ScrollView, Text, View, YStack } from "tamagui";
-import { Button, Card, H4, Paragraph, XStack } from "tamagui";
-
+import { ScrollView, Text, YStack } from "tamagui";
+import { XStack } from "tamagui";
 import HeaderBar from "../../components/HeaderBar";
 import { MySafeAreaView } from "../../components/MySafeAreaView";
 import { MyStack } from "../../components/MyStack";
-import SearchBar from "../../components/SearchBar";
-import { SheetDemo } from "../../components/SheetDemo";
-
-const DemoCard = ({ text, iconText, iconColor, size, children, func }: any) => {
-  return (
-    <Card
-      size={"$4"}
-      bordered
-      height={85}
-      backgroundColor={"white"}
-      animation="bouncy"
-      // marginLeft={"$2.5"}
-      // scale={1}
-      // hoverStyle={{ scale: 0.925 }}
-      // pressStyle={{ scale: 0.875 }}
-      // onPress={func}
-    >
-      <Card.Header
-        flexDirection="row"
-        alignItems="center"
-        gap={10}
-        padded
-      >
-        <MaterialCommunityIcons
-          name={iconText}
-          color={iconColor}
-          size={size}
-        />
-        <YStack>
-          <H4 color={"black"}>{text}</H4>
-          {children}
-        </YStack>
-      </Card.Header>
-      <Card.Background></Card.Background>
-    </Card>
-  );
-};
-
-const CardParagraph = ({ text, iconText, iconColor }: any) => {
-  return (
-    <Paragraph
-      theme="alt2"
-      color={"grey"}
-      marginTop={-5}
-    >
-      <MaterialCommunityIcons
-        name={iconText}
-        color={iconColor}
-        size={15}
-      />{" "}
-      {text}
-    </Paragraph>
-  );
-};
-
-// const renderRightActions = (progress: any, dragAnimatedValue: any) => {
-//   const opacity = dragAnimatedValue.interpolate({
-//     inputRange: [-100, 0],
-//     outputRange: [1, 0],
-//     extrapolate: "clamp"
-//   });
-//   return (
-//     <View style={styles.swipedRow}>
-//       <View style={styles.swipedConfirmationContainer}>
-//         <Text style={styles.deleteConfirmationText}>Are you sure?</Text>
-//       </View>
-//       <Animated.View
-//         style={[{ opacity, alignItems: "center", justifyContent: "center" }]}
-//       >
-//         <Button
-//           marginTop={-24}
-//           height={"115%"}
-//           theme="red"
-//           justifyContent="flex-end"
-//         >
-//           <Text color={"$red10Dark"}>Delete</Text>
-//         </Button>
-//       </Animated.View>
-//     </View>
-//   );
-// };
-
-const renderRightActions = (progress, dragAnimatedValue) => {
-  const trans = progress.interpolate({
-    inputRange: [0, 1],
-    outputRange: [175, 0],
-    extrapolate: "clamp"
-  });
-  const opacity = dragAnimatedValue.interpolate({
-    inputRange: [-100, 0],
-    outputRange: [1, 0],
-    extrapolate: "clamp"
-  });
-  // const pressHandler = () => {
-  //   this.close();
-  //   alert(text);
-  // };
-  return (
-    <Animated.View
-      style={{ flex: 1, transform: [{ translateX: trans }], opacity }}
-    >
-      <RectButton
-        style={[
-          styles.rightAction,
-          { backgroundColor: "red", borderRadius: 10 }
-        ]}
-        // onPress={pressHandler}
-      >
-        <Trash
-          size={25}
-          color="white"
-        />
-      </RectButton>
-    </Animated.View>
-  );
-};
-
-const SheetCard = ({ text, iconText, iconColor, size, children }: any) => {
-  const [open, setOpen] = useState(false);
-  return (
-    <View
-      width={"100%"}
-      paddingHorizontal={"$2"}
-    >
-      <Swipeable
-        friction={3}
-        shouldCancelWhenOutside={true}
-        cancelsTouchesInView={true}
-        renderRightActions={renderRightActions}
-        rightThreshold={2}
-        overshootFriction={7}
-      >
-        <SheetDemo
-          open={open}
-          setOpen={setOpen}
-        >
-          <DemoCard
-            text={text}
-            iconText={iconText}
-            iconColor={iconColor}
-            size={size}
-            func={() => setOpen(true)}
-          >
-            {children}
-          </DemoCard>
-        </SheetDemo>
-      </Swipeable>
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    minHeight: 300
-  },
-  row: {
-    flexDirection: "row",
-    flex: 1,
-    alignItems: "center",
-    paddingLeft: 5,
-    backgroundColor: "#efefef",
-    margin: 20,
-    minHeight: 50
-  },
-  swipedRow: {
-    flexDirection: "row",
-    flex: 1,
-    alignItems: "center",
-    paddingLeft: 5,
-    backgroundColor: "#818181",
-    margin: 20,
-    minHeight: 50
-  },
-  swipedConfirmationContainer: {
-    flex: 1
-  },
-  deleteConfirmationText: {
-    color: "#fcfcfc",
-    fontWeight: "bold"
-  },
-  deleteButton: {
-    backgroundColor: "#b60000",
-    flexDirection: "column",
-    justifyContent: "center",
-    height: "100%"
-  },
-  deleteButtonText: {
-    color: "#fcfcfc",
-    fontWeight: "bold",
-    padding: 3
-  },
-  rightAction: {
-    alignItems: "center",
-    paddingRight: 20,
-    paddingLeft: 20,
-    flex: 1,
-    justifyContent: "center"
-  }
-});
+import SearchBar from "../../components/home/SearchBar";
+import { SheetCard } from "../../components/home/SheetCard";
 
 export default function Home() {
   const [defaultItems, setDefaultItems] = useState([
@@ -262,8 +59,6 @@ export default function Home() {
           gap={30}
           padding={"5%"}
           paddingLeft={"4%"}
-          // marginTop={-10}
-          // margin={"$4"}
         >
           <HeaderBar />
 
@@ -287,14 +82,9 @@ export default function Home() {
         </YStack>
 
         <ScrollView
-          // marginLeft={-3}
-          // marginBottom={-50}
           marginTop={-25}
           showsVerticalScrollIndicator={false}
           contentContainerStyle={{ alignItems: "center" }}
-          // paddingLeft={"4%"}
-          // marginLwe={"$4"}
-          // paddingRight={"4%"}
         >
           <YStack
             alignItems="center"
@@ -338,65 +128,6 @@ export default function Home() {
                     );
                   }
                 })}
-
-            {/* <SheetCard
-              text={"Welcome to OpenHealth"}
-              iconText={"heart"}
-              iconColor={"red"}
-              size={35}
-            />
-
-            <SheetCard
-              text={"Your personal objective"}
-              iconText={"pen"}
-              iconColor={"darkblue"}
-              size={50}
-            > */}
-            {/* <CardParagraph
-                text={"1 minute"}
-                iconText={"clock"}
-                iconColor={"grey"}
-              /> */}
-            {/* </SheetCard> */}
-
-            {/* <SheetCard
-              text={"Todays Tracking"}
-              iconText={"calendar"}
-              iconColor={"orange"}
-              size={50}
-            > */}
-            {/* <CardParagraph
-                text={"1 minute"}
-                iconText={"clock"}
-                iconColor={"grey"}
-              /> */}
-            {/* </SheetCard> */}
-
-            {/* <SheetCard
-              text={"Receive Coaching"}
-              iconText={"account-group"}
-              iconColor={"purple"}
-              size={50}
-            > */}
-            {/* <CardParagraph
-                text={"2 minutes"}
-                iconText={"clock"}
-                iconColor={"grey"}
-              /> */}
-            {/* </SheetCard> */}
-
-            {/* <SheetCard
-              text={"Health Check-In"}
-              iconText={"plus-circle"}
-              iconColor={"green"}
-              size={50}
-            > */}
-            {/* <CardParagraph
-                text={"4 minutes"}
-                iconText={"clock"}
-                iconColor={"grey"}
-              /> */}
-            {/* </SheetCard> */}
           </YStack>
         </ScrollView>
       </MySafeAreaView>
diff --git a/app/users/[user].tsx b/app/users/[user].tsx
index afaa410..971a038 100644
--- a/app/users/[user].tsx
+++ b/app/users/[user].tsx
@@ -1,8 +1,8 @@
 import { ArrowLeft } from "@tamagui/lucide-icons";
-import { useRouter, useSearchParams } from "expo-router";
+import { useRouter, useGlobalSearchParams } from "expo-router";
 import { Button, H3, H6, XStack } from "tamagui";
 
-import DialogDemo from "../../components/DialogDemo";
+import DialogDemo from "../../components/profile/DialogDemo";
 import { MyStack } from "../../components/MyStack";
 import SelectDemo from "../../components/SelectDemo";
 import SpinnerDemo from "../../components/SpinnerDemo";
@@ -10,7 +10,7 @@ import SwitchDemo from "../../components/SwitchDemo";
 
 export default function User() {
   const router = useRouter();
-  const params = useSearchParams();
+  const params = useGlobalSearchParams();
 
   return (
     <MyStack justifyContent="flex-start">
diff --git a/components/Action.tsx b/components/Action.tsx
deleted file mode 100644
index bcdcb23..0000000
--- a/components/Action.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from "react";
-import { StyleSheet, Text, View } from "react-native";
-import Animated, {
-  divide,
-  interpolate,
-  Extrapolate,
-  sub,
-  cond,
-  add,
-  lessThan,
-  multiply,
-} from "react-native-reanimated";
-import { HEIGHT } from "./ItemLayout";
-
-const styles = StyleSheet.create({
-  remove: {
-    color: "white",
-    fontFamily: "UberMoveMedium",
-    fontSize: 14,
-  },
-});
-
-interface ActionProps {}
-
-const Action = ({}: ActionProps) => {
-  return (
-    <View
-      style={{
-        backgroundColor: "#D93F12",
-        justifyContent: "center",
-        alignItems: "center",
-      }}
-    >
-      <View
-        style={{
-          height: 5,
-          width: 20,
-          backgroundColor: "white",
-        }}
-      />
-      <View
-        style={{
-          ...StyleSheet.absoluteFillObject,
-          justifyContent: "center",
-          alignItems: "center",
-        }}
-      >
-        <Text style={styles.remove}>Remove</Text>
-      </View>
-    </View>
-  );
-};
-
-export default Action;
diff --git a/components/DemoCard.tsx b/components/calorie/DemoCard.tsx
similarity index 100%
rename from components/DemoCard.tsx
rename to components/calorie/DemoCard.tsx
diff --git a/components/home/CardParagraph.tsx b/components/home/CardParagraph.tsx
new file mode 100644
index 0000000..5e65651
--- /dev/null
+++ b/components/home/CardParagraph.tsx
@@ -0,0 +1,19 @@
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { Paragraph } from "tamagui";
+
+export const CardParagraph = ({ text, iconText, iconColor }: any) => {
+    return (
+      <Paragraph
+        theme="alt2"
+        color={"grey"}
+        marginTop={-5}
+      >
+        <MaterialCommunityIcons
+          name={iconText}
+          color={iconColor}
+          size={15}
+        />{" "}
+        {text}
+      </Paragraph>
+    );
+}
\ No newline at end of file
diff --git a/components/home/DemoCard.tsx b/components/home/DemoCard.tsx
new file mode 100644
index 0000000..3bd49ec
--- /dev/null
+++ b/components/home/DemoCard.tsx
@@ -0,0 +1,33 @@
+import React from "react";
+import { Card, YStack, H4 } from "tamagui";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+
+export const DemoCard = ({ text, iconText, iconColor, size, children, func }: any) => {
+    return (
+      <Card
+        size={"$4"}
+        bordered
+        height={85}
+        backgroundColor={"white"}
+        animation="bouncy"
+      >
+        <Card.Header
+          flexDirection="row"
+          alignItems="center"
+          gap={10}
+          padded
+        >
+          <MaterialCommunityIcons
+            name={iconText}
+            color={iconColor}
+            size={size}
+          />
+          <YStack>
+            <H4 color={"black"}>{text}</H4>
+            {children}
+          </YStack>
+        </Card.Header>
+        <Card.Background></Card.Background>
+      </Card>
+    );
+  };
\ No newline at end of file
diff --git a/components/SearchBar.tsx b/components/home/SearchBar.tsx
similarity index 100%
rename from components/SearchBar.tsx
rename to components/home/SearchBar.tsx
diff --git a/components/home/SheetCard.tsx b/components/home/SheetCard.tsx
new file mode 100644
index 0000000..7ae0ad4
--- /dev/null
+++ b/components/home/SheetCard.tsx
@@ -0,0 +1,131 @@
+import { Trash } from "@tamagui/lucide-icons";
+import { useRef, useState } from "react";
+import { Animated, StyleSheet } from "react-native";
+import { RectButton, Swipeable } from "react-native-gesture-handler";
+import { DemoCard } from "./DemoCard";
+import {View} from "tamagui"
+import { SheetDemo } from "./SheetDemo";
+
+export const SheetCard = ({ text, iconText, iconColor, size, children }: any) => {
+    const swipe:any = useRef(null);
+    const [open, setOpen] = useState(false);
+  
+    const renderRightActions = (progress, dragAnimatedValue) => {
+      const trans = progress.interpolate({
+        inputRange: [0, 1],
+        outputRange: [180, 0],
+        extrapolate: "clamp"
+      });
+      const opacity = dragAnimatedValue.interpolate({
+        inputRange: [-100, 0],
+        outputRange: [1, 0],
+        extrapolate: "clamp"
+      });
+      const pressHandler = () => {
+        swipe.current.close();
+      };
+      return (
+        <Animated.View
+          style={{ flex: 1, transform: [{ translateX: trans }], opacity }}
+        >
+          <RectButton
+    
+            style={[
+              styles.rightAction,
+              { backgroundColor: "rgba(248, 0, 0, 0.8)", borderRadius: 10 }
+            ]}
+            onPress={pressHandler}
+          >
+            <Trash
+              size={25}
+              color="white"
+            />
+          </RectButton>
+        </Animated.View>
+      );
+    };
+  
+    
+    return (
+      <View
+        width={"100%"}
+        paddingHorizontal={"$2"}
+      >
+        <Swipeable
+          ref={swipe}
+          friction={3}
+          shouldCancelWhenOutside={true}
+          cancelsTouchesInView={true}
+          renderRightActions={renderRightActions}
+          rightThreshold={2}
+          overshootFriction={7}
+          
+        >
+          <SheetDemo
+            open={open}
+            setOpen={setOpen}
+          >
+            <DemoCard
+              text={text}
+              iconText={iconText}
+              iconColor={iconColor}
+              size={size}
+              func={() => setOpen(true)}
+            >
+              {children}
+            </DemoCard>
+          </SheetDemo>
+        </Swipeable>
+      </View>
+    );
+  };
+  
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      minHeight: 300
+    },
+    row: {
+      flexDirection: "row",
+      flex: 1,
+      alignItems: "center",
+      paddingLeft: 5,
+      backgroundColor: "#efefef",
+      margin: 20,
+      minHeight: 50
+    },
+    swipedRow: {
+      flexDirection: "row",
+      flex: 1,
+      alignItems: "center",
+      paddingLeft: 5,
+      backgroundColor: "#818181",
+      margin: 20,
+      minHeight: 50
+    },
+    swipedConfirmationContainer: {
+      flex: 1
+    },
+    deleteConfirmationText: {
+      color: "#fcfcfc",
+      fontWeight: "bold"
+    },
+    deleteButton: {
+      backgroundColor: "#b60000",
+      flexDirection: "column",
+      justifyContent: "center",
+      height: "100%"
+    },
+    deleteButtonText: {
+      color: "#fcfcfc",
+      fontWeight: "bold",
+      padding: 3
+    },
+    rightAction: {
+      alignItems: "center",
+      paddingRight: 20,
+      paddingLeft: 20,
+      flex: 1,
+      justifyContent: "center"
+    }
+  });
\ No newline at end of file
diff --git a/components/SheetDemo.tsx b/components/home/SheetDemo.tsx
similarity index 100%
rename from components/SheetDemo.tsx
rename to components/home/SheetDemo.tsx
diff --git a/components/DialogDemo.tsx b/components/profile/DialogDemo.tsx
similarity index 98%
rename from components/DialogDemo.tsx
rename to components/profile/DialogDemo.tsx
index fda5ac9..ed7daef 100644
--- a/components/DialogDemo.tsx
+++ b/components/profile/DialogDemo.tsx
@@ -11,7 +11,7 @@ import {
   YStack
 } from "tamagui";
 
-import SelectDemo from "./SelectDemo";
+import SelectDemo from "../SelectDemo";
 
 export default function DialogDemo() {
   return (
diff --git a/components/arnold.py b/components/python/arnold.py
similarity index 100%
rename from components/arnold.py
rename to components/python/arnold.py
diff --git a/components/dietician.py b/components/python/dietician.py
similarity index 100%
rename from components/dietician.py
rename to components/python/dietician.py
diff --git a/components/genericCoach.py b/components/python/genericCoach.py
similarity index 100%
rename from components/genericCoach.py
rename to components/python/genericCoach.py
diff --git a/components/goggins.py b/components/python/goggins.py
similarity index 100%
rename from components/goggins.py
rename to components/python/goggins.py
diff --git a/components/mikementzer.py b/components/python/mikementzer.py
similarity index 100%
rename from components/mikementzer.py
rename to components/python/mikementzer.py
diff --git a/package.json b/package.json
index 967e07f..1a66a8e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
   "name": "fitgoat",
   "version": "1.0.0",
   "main": "expo-router/entry",
-  "type": "module",
   "scripts": {
     "start": "expo start",
     "android": "expo run:android",