diff --git a/bml-old.sh b/bml-old.sh
new file mode 100755
index 0000000..4545382
--- /dev/null
+++ b/bml-old.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+#display menu
+echo "Menu"
+echo ""
+echo "1 - Accounts"
+echo "2 - Contacts"
+echo "3 - Activities"
+echo "4 - Services"
+echo "5 - Settings"
+echo ""
+printf 'Please Input: '
+read -r MENU
+
+if [ "$MENU" = "1" ]
+	then
+		curl -s -b $COOKIE $BML_URL/dashboard | jq
+elif [ "$MENU" = "2" ]
+	then
+		echo ""
+		echo "Contacts"
+		echo ""
+		echo "1 - Transfer"
+		echo "2 - Add Contact"
+		echo "3 - Delete Conact"
+		echo ""
+		printf 'Please Input: '
+		read -r CONTACS
+
+		if [ "$CONTACS" = "1" ]
+			then
+				curl -s -b $COOKIE $BML_URL/contacts | jq -r '["Account Number","Currency","Account Name","Contact Name"], ["==================================================================="], (.["payload"] | .[] | [.account, .currency, .name, .alias]) | @tsv'
+		elif [ "$CONTACS" = "2" ]
+			then
+				printf 'Account Number: '
+				read -r ACCOUNT_NUMBER
+				VALID_NUMBER=$(curl -s -b $COOKIE $BML_URL/validate/account/$ACCOUNT_NUMBER \
+						| jq -r .success)
+					if [ "$VALID_NUMBER" = "true" ]
+						then
+							printf 'Name: '
+							curl -s -b $COOKIE $BML_URL/validate/account/$ACCOUNT_NUMBER | jq -r .
+							read -r ACCOUNT_NAME
+							curl -s -b $COOKIE $BML_URL | jq
+					else
+							echo "${red}Invalid Account" 1>&2
+					fi
+		elif [ "$CONTACS" = "3" ]
+			then
+				echo ""
+		else
+			exit
+		fi
+elif [ "$MENU" = "3" ]
+	then
+		curl -s -b $COOKIE $BML_URL/activities | jq
+elif [ "$MENU" = "4" ]
+	then
+		curl -s -b $COOKIE $BML_URL/services/applications/context | jq
+elif [ "$MENU" = "5" ]
+        then
+		curl -s -b $COOKIE $BML_URL/settings | jq
+else
+	echo "${red}There was an error"
+fi
+
diff --git a/bml.sh b/bml.sh
index 7e2f4e3..785858a 100755
--- a/bml.sh
+++ b/bml.sh
@@ -50,6 +50,7 @@ if [ "$LOGIN" = "true" ]
 		echo ${green}Welcome ${reset}$NAME
 #		curl -s -b $COOKIE $BML_URL/userinfo
 		echo ""
+		source mainmenu.sh
 else
 		#Display error if login was not succuessfull and delete cookie
                 echo "${red}An error occured, Please check Username and Password" 1>&2
@@ -57,67 +58,4 @@ else
                 exit
 fi
 
-#display menu
-echo "Menu"
-echo ""
-echo "1 - Accounts"
-echo "2 - Contacts"
-echo "3 - Activities"
-echo "4 - Services"
-echo "5 - Settings"
-echo ""
-printf 'Please Input: '
-read -r MENU
-
-if [ "$MENU" = "1" ]
-	then
-		curl -s -b $COOKIE $BML_URL/dashboard | jq
-elif [ "$MENU" = "2" ]
-	then
-		echo ""
-		echo "Contacts"
-		echo ""
-		echo "1 - Transfer"
-		echo "2 - Add Contact"
-		echo "3 - Delete Conact"
-		echo ""
-		printf 'Please Input: '
-		read -r CONTACS
-
-		if [ "$CONTACS" = "1" ]
-			then
-				curl -s -b $COOKIE $BML_URL/contacts | jq -r '["Account Number","Currency","Account Name","Contact Name"], ["==================================================================="], (.["payload"] | .[] | [.account, .currency, .name, .alias]) | @tsv'
-		elif [ "$CONTACS" = "2" ]
-			then
-				printf 'Account Number: '
-				read -r ACCOUNT_NUMBER
-				VALID_NUMBER=$(curl -s -b $COOKIE $BML_URL/validate/account/$ACCOUNT_NUMBER \
-						| jq -r .success)
-					if [ "$VALID_NUMBER" = "true" ]
-						then
-							printf 'Name: '
-							curl -s -b $COOKIE $BML_URL/validate/account/$ACCOUNT_NUMBER | jq -r .
-							read -r ACCOUNT_NAME
-							curl -s -b $COOKIE $BML_URL | jq
-					else
-							echo "${red}Invalid Account" 1>&2
-					fi
-		elif [ "$CONTACS" = "3" ]
-			then
-				echo ""
-		else
-			exit
-		fi
-elif [ "$MENU" = "3" ]
-	then
-		curl -s -b $COOKIE $BML_URL/activities | jq
-elif [ "$MENU" = "4" ]
-	then
-		curl -s -b $COOKIE $BML_URL/services/applications/context | jq
-elif [ "$MENU" = "5" ]
-        then
-		curl -s -b $COOKIE $BML_URL/settings | jq
-else
-	echo "${red}There was an error"
-fi
 
diff --git a/contactsmenu.sh b/contactsmenu.sh
new file mode 100755
index 0000000..3415b08
--- /dev/null
+++ b/contactsmenu.sh
@@ -0,0 +1,33 @@
+echo ""
+echo "Contacts"
+echo ""
+echo "1 - List Contacts"
+echo "2 - Add Contact"
+echo "3 - Delete Conact"
+echo "4 - Go back"
+echo "5 - Exit"
+echo ""
+printf 'Please Input: '
+read -r CONTATCS
+
+if [ "$CONTATCS" = "1" ]
+	then
+	source listcontact.sh
+elif [ "$CONTATCS" = "2" ]
+	then
+	source addcontact.sh
+elif [ "$CONTATCS" = "3" ]
+	then
+	source delete contact.sh
+elif [ "$CONTATCS" = "4" ]
+	then
+	source mainmenu.sh
+elif [ "$CONTATCS" = "5" ]
+	then
+	rm $COOKIE
+	exit
+else
+	echo "${red}There was an error${reset}" 1>&2
+	clear
+	source contactsmenu.sh
+fi
diff --git a/mainmenu.sh b/mainmenu.sh
new file mode 100755
index 0000000..bf63e80
--- /dev/null
+++ b/mainmenu.sh
@@ -0,0 +1,40 @@
+echo "Menu"
+echo ""
+echo "1 - Accounts"
+echo "2 - Transfer"
+echo "3 - Contacts"
+echo "4 - Activities"
+echo "5 - Services"
+echo "6 - Settings"
+echo "7 - Exit"
+echo ""
+printf 'Please Input: '
+read -r MENU
+
+if [ "$MENU" = "1" ]
+        then
+	source accounts.sh 
+elif [ "$MENU" = "2" ]
+        then
+	source transfer.sh
+elif [ "$MENU" = "3" ]
+        then
+	source contactsmenu.sh
+elif [ "$MENU" = "4" ]
+        then
+	source activities.sh
+elif [ "$MENU" = "5" ]
+        then
+	source services.sh
+elif [ "$MENU" = "6" ]
+	then
+	source settingsmenu.sh
+elif [ "$MENU" = "7" ]
+	then
+	rm $COOKIE
+	exit
+else
+        echo "${red}There was an error${reset}" 1>&2
+	clear
+	source mainmenu.sh
+fi