diff --git a/.env b/.env
index 138dabb..954b800 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-#REACT_APP_TUITIO_URL=http://localhost:5063
-REACT_APP_TUITIO_URL=https://lab.code-rove.com/tuitio
+REACT_APP_TUITIO_URL=http://localhost:5063
+# REACT_APP_TUITIO_URL=https://lab.code-rove.com/tuitio
 
 REACT_APP_NETWORK_RESURRECTOR_API_URL=http://localhost:5064
 #REACT_APP_NETWORK_RESURRECTOR_API_URL=https://lab.code-rove.com/network-resurrector-api
diff --git a/src/components/layout/AppRoutes.js b/src/components/layout/AppRoutes.js
index 03c0b3d..18760a4 100644
--- a/src/components/layout/AppRoutes.js
+++ b/src/components/layout/AppRoutes.js
@@ -5,7 +5,7 @@ import NetworkContainer from "../../features/network/components/NetworkContainer
 import SystemContainer from "../../features/system/SystemContainer";
 import SettingsContainer from "../../features/settings/SettingsContainer";
 import DashboardContainer from "../../features/dashboard/components/DashboardContainer";
-import UserProfileContainer from "../../features/user/profile/components/UserProfileContainer";
+import UserProfileContainer from "../../features/user/profile/card/UserProfileContainer";
 import AboutContainer from "../../features/about/AboutContainer";
 
 const AppRoutes = () => {
diff --git a/src/features/user/profile/components/UserProfileCardContent.js b/src/features/user/profile/card/UserProfileCardContent.js
similarity index 96%
rename from src/features/user/profile/components/UserProfileCardContent.js
rename to src/features/user/profile/card/UserProfileCardContent.js
index 9a9ee86..0de42eb 100644
--- a/src/features/user/profile/components/UserProfileCardContent.js
+++ b/src/features/user/profile/card/UserProfileCardContent.js
@@ -2,7 +2,7 @@ import React, { useMemo } from "react";
 import PropTypes from "prop-types";
 import { Grid } from "@material-ui/core";
 import UserProfilePicture from "./UserProfilePicture";
-import ContactOptions from "./ContactOptions";
+import ContactOptions from "../contact/ContactOptions";
 import { makeStyles } from "@material-ui/core/styles";
 import styles from "../styles";
 
diff --git a/src/features/user/profile/components/UserProfileComponent.js b/src/features/user/profile/card/UserProfileComponent.js
similarity index 100%
rename from src/features/user/profile/components/UserProfileComponent.js
rename to src/features/user/profile/card/UserProfileComponent.js
diff --git a/src/features/user/profile/components/UserProfileContainer.js b/src/features/user/profile/card/UserProfileContainer.js
similarity index 100%
rename from src/features/user/profile/components/UserProfileContainer.js
rename to src/features/user/profile/card/UserProfileContainer.js
diff --git a/src/features/user/profile/components/UserProfilePicture.js b/src/features/user/profile/card/UserProfilePicture.js
similarity index 100%
rename from src/features/user/profile/components/UserProfilePicture.js
rename to src/features/user/profile/card/UserProfilePicture.js
diff --git a/src/features/user/profile/components/ContactOption.js b/src/features/user/profile/contact/ContactOption.js
similarity index 100%
rename from src/features/user/profile/components/ContactOption.js
rename to src/features/user/profile/contact/ContactOption.js
diff --git a/src/features/user/profile/components/ContactOptions.js b/src/features/user/profile/contact/ContactOptions.js
similarity index 100%
rename from src/features/user/profile/components/ContactOptions.js
rename to src/features/user/profile/contact/ContactOptions.js