From a3b2babb33d06b28febe627d1c0f775516765cec Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Thu, 21 May 2020 02:34:16 +0200
Subject: [PATCH] better convention respect

---
 g1sms/cron_VIR.recurrent.sh    | 12 +++---
 g1sms/functions.sh             | 79 +++++++++++++++++-----------------
 g1sms/init.sh                  |  2 +-
 g1sms/init_keys.sh             |  5 +--
 g1sms/sms_ADMIN.sh             |  8 ++--
 g1sms/sms_ASTROPORT.sh         |  6 +--
 g1sms/sms_AUTH.sh              |  2 +-
 g1sms/sms_BILLET.sh            |  6 +--
 g1sms/sms_BILLETCHK.sh         |  2 +-
 g1sms/sms_BILLET_MAKE.sh       |  6 +--
 g1sms/sms_COUNT.sh             |  4 +-
 g1sms/sms_DESTROY.sh           | 12 +++---
 g1sms/sms_EMAIL.sh             |  4 +-
 g1sms/sms_G1TAG.sh             | 36 ++++++++--------
 g1sms/sms_NEW.sh               |  2 +-
 g1sms/sms_PAY.sh               |  8 ++--
 g1sms/sms_REC.sh               | 36 ++++++++--------
 g1sms/sms_SETUNIT.sh           |  4 +-
 g1sms/sms_VIR.sh               | 18 ++++----
 g1sms/sms_WHERE.sh             |  8 ++--
 g1sms/sms_received.sh          |  4 +-
 zen/tools/make_G1SSB_secret.sh |  4 +-
 22 files changed, 133 insertions(+), 135 deletions(-)

diff --git a/g1sms/cron_VIR.recurrent.sh b/g1sms/cron_VIR.recurrent.sh
index f9c7353..c5aabb0 100755
--- a/g1sms/cron_VIR.recurrent.sh
+++ b/g1sms/cron_VIR.recurrent.sh
@@ -19,7 +19,7 @@ echo "" > /tmp/VIR
 
 TODAY=$(date '+%Y%m%d')
 log "__SUB:cron_VIR.reccurent.sh:  Searching payements to do for $TODAY"
-for file in /home/$YOU/.zen/g1sms_wallets/*/VIREMENTS.gpg ; do
+for file in /home/$YOU/.zen/g1sms/*/VIREMENTS.gpg ; do
     if [[ -f $file ]]; then
         log "__SUB:cron_VIR.reccurent.sh: FOUND $file decrypting with Node key"
         echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "$file"
@@ -46,7 +46,7 @@ while read line
         sms_INIT_ACCOUNT "$PHONE" "NOSMS"
 
         duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
-        PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $REF / $NB" -y)
+        PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $REF / $NB" -y)
         if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
             sms_ERROR "$PHONE" "Problème Virement. $PAY";
         else
@@ -60,10 +60,10 @@ while read line
 done < /tmp/VIR$TODAY
 
 # CHECK FOR LAST VIREMENTS AND CLEAN IT? 
-for virfile in "/home/$YOU/.zen/g1sms_wallets/*/VIREMENTS.gpg"; do
+for virfile in "/home/$YOU/.zen/g1sms/*/VIREMENTS.gpg"; do
     phone=$(echo $virfile | cut -d '/' -f 6)
     if [[ "$phone" == "*" ]]; then exit; fi
-    echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/$phone.VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms_wallets/$phone/VIREMENTS.gpg"
+    echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/$phone.VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms/$phone/VIREMENTS.gpg"
     nv=0; tot=0;
     while read ligne
     do virs=(${ligne});
@@ -78,8 +78,8 @@ for virfile in "/home/$YOU/.zen/g1sms_wallets/*/VIREMENTS.gpg"; do
     if [[ $nv -eq 0 ]]; then
         log "__SUB:cron_VIR.reccurent.sh: Plus AUCUN payement récurrent !!"
         sms_SEND "$phone" "Plus AUCUN payement récurrent"
-        rm -f /home/$YOU/.zen/g1sms_wallets/$phone/VIREMENTS.gpg
-        rm -f /home/$YOU/.zen/g1sms_wallets/$phone/VIREMENTS
+        rm -f /home/$YOU/.zen/g1sms/$phone/VIREMENTS.gpg
+        rm -f /home/$YOU/.zen/g1sms/$phone/VIREMENTS
         I=$(ipfs_node_wallets_add)
     else
         log "__SUB:cron_VIR.reccurent.sh: Encore $nv payements récurrents à réaliser pour $tot G1"
diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index a56350d..4b3573d 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -20,7 +20,7 @@ function sms_SEND () {
 	local dest="$1"
 	local mess="$2"
 	if [[ ${#dest} -eq 10 || ${#dest} -eq 12 ]]; then
-        if [[ -d /home/$YOU/.zen/g1sms_wallets/$dest ]]; then
+        if [[ -d /home/$YOU/.zen/g1sms/$dest ]]; then
         # TEST IF $dest IS ON CURRENT NODE
             sudo gammu-smsd-inject TEXT "$dest" -text "$mess" 1>&2
         else
@@ -98,11 +98,11 @@ function ipfs_node_wallets_add (){
     ##########################
     log "TODO ipfs_node_wallets_add"
     ##########################
-#    IWALLETS=$(su $YOU -c "ipfs add -rHq '/home/$YOU/.zen/g1sms_wallets' | tail -n 1")
+#    IWALLETS=$(su $YOU -c "ipfs add -rHq '/home/$YOU/.zen/g1sms' | tail -n 1")
 
     # CHAIN STATE FOR $IPFSNODEID
 #    echo $IWALLETS > /home/$YOU/.zen/ipfs/.$IPFSNODEID.wallets.chain
-#    log "__SUB:ipfs_node_wallets_add: NEW '/home/$YOU/.zen/g1sms_wallets' HASH ipfs ls $IWALLETS"
+#    log "__SUB:ipfs_node_wallets_add: NEW '/home/$YOU/.zen/g1sms' HASH ipfs ls $IWALLETS"
 
     # PUBLISH IPNS NODE WALLETS
 #    NODEWALLETS=$(su $YOU -c "ipfs name publish --quieter /ipfs/$IWALLETS")
@@ -115,9 +115,9 @@ function ipfs_node_wallets_add (){
 #################################################################################################################################
 function sms_uid2key (){
     # sms_uid2key "$MEMBERUID" "$PHONE" "$PIN"
-	RIBFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidrib"
-	NAMEFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidname"
-    UIDNAFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidna"
+	RIBFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidrib"
+	NAMEFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidname"
+    UIDNAFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidna"
     # New related wallet asked
 	ASKWALLET="$1"
     #For micro payement
@@ -143,7 +143,7 @@ function sms_uid2key (){
 	fi
 	
 	# Search fo duplicate
-	DUP=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms_wallets/*/_uidname 2>/dev/null | cut -f 6 -d '/')
+	DUP=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms/*/_uidname 2>/dev/null | cut -f 6 -d '/')
 	if [[ "$DUP" != "" && "$DUP" != "$PHONE" ]]; then
 		sms_SEND "$ADMINPHONE" "ADMIN! INFO: $PHONE prend le même $ASKWALLET, que $DUP"
 		sms_SEND "$DUP" "Vous devez savoir que $ASKWALLET est associé à un autre téléphone que le votre également!"
@@ -153,10 +153,10 @@ function sms_uid2key (){
     # FIND ASKWALLET into wallets, wallest_swarm OR duniter (silkaj)
     DESTMEM="$VIRDEST"
     # SEARCH IN WALLETS
-    LOCAL=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms_wallets/*/_uidna 2>/dev/null | cut -f 6 -d '/')
+    LOCAL=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms/*/_uidna 2>/dev/null | cut -f 6 -d '/')
     if [[ "$LOCAL" != "" ]]; then
         # LOCAL G1sms account
-        DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets/$LOCAL/_pub)
+        DESTRIB=$(cat /home/$YOU/.zen/g1sms/$LOCAL/_pub)
         DESTPHONE=$LOCAL
         log "__SUB:sms_uid2key: FOUND LOCAL ($MASTERPHONE) G1sms+ wallet: $DESTRIB ($LOCAL)"
     else
@@ -178,9 +178,9 @@ function sms_uid2key (){
         DESTRIB=$(silkaj id "$ASKWALLET" | grep -w "$ASKWALLET" | awk '{print $2}' | tail -n 1)
         log "__SUB:sms_uid2key: OUT OFF SWARM MEMBER wallet: $DESTRIB"
         # GET CESIUM+ geoPoint DATA (TODO: cron for GCHANGE SMS Alert)
-        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.geoPoint' > "/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidgeo.json"
-        log "__SUB:sms_uid2key: GET CESIUM+ geoPoint and AVATAR : $(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/_uidgeo.json)"
-        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.avatar._content' | sed 's/\"//g' | base64 -d > "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png"
+        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.geoPoint' > "/home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json"
+        log "__SUB:sms_uid2key: GET CESIUM+ geoPoint and AVATAR : $(cat /home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json)"
+        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.avatar._content' | sed 's/\"//g' | base64 -d > "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png"
     fi
 
 	if [ "$DESTRIB" != "" ]; then
@@ -188,7 +188,7 @@ function sms_uid2key (){
 		echo "$ASKWALLET" > "$NAMEFILE"
 		log "__SUB:sms_uid2key: NEW EXTERNAL RELATED $DESTRIB / FOR MEMBER OR WALLET = $ASKWALLET - INIT 0.1 TX"
         duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/tools/duniter_getnode.sh)
-		INIT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output $DESTRIB --amount 1 --comment "[G1sms+] Porte Monnaie $(cat $UIDNAFILE) ->  $(cat $NAMEFILE)" -y)
+		INIT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output $DESTRIB --amount 1 --comment "[G1sms+] Porte Monnaie $(cat $UIDNAFILE) ->  $(cat $NAMEFILE)" -y)
 
 		log "__SUB:sms_uid2key: INIT = $INIT | Create Connection with related Wallet."
 		sms_SEND "$ADMINPHONE" "ADMIN! LOG: $PHONE Nouveau compte lié $UIDNA -- $ASKWALLET ($INIT)"
@@ -235,25 +235,25 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 	UNKNOWN=0
 	# TODO Optimize GLOBAL/local variables use, use more function array output ?!
     # Initiate PHONE settings files and values
-    IPFSNODEIDFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/MASTERPHONE.ipfsid" # Contains G1sms+ NODE IPFS id
-	SMSNODE="/home/$YOU/.zen/g1sms_wallets/$PHONE/MASTERPHONE.sms" # Contains G1sms+ SMS phone number
-	PINFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_pin" # Contains phone wallet diceware password
-	GPGPINFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_pin.gpg" # Contains g1smsnode cypher phone wallet diceware password
-    DUNIKEYFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey" # secret.dunikey
-	PUBKEYFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_pub" # Contains phone wallet public key (RIB)
-	UNITFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_unit" # Contains phone wallet prefered unit (LOVE,G1,DU)
+    IPFSNODEIDFILE="/home/$YOU/.zen/g1sms/$PHONE/MASTERPHONE.ipfsid" # Contains G1sms+ NODE IPFS id
+	SMSNODE="/home/$YOU/.zen/g1sms/$PHONE/MASTERPHONE.sms" # Contains G1sms+ SMS phone number
+	PINFILE="/home/$YOU/.zen/g1sms/$PHONE/_pin" # Contains phone wallet diceware password
+	GPGPINFILE="/home/$YOU/.zen/g1sms/$PHONE/_pin.gpg" # Contains g1smsnode cypher phone wallet diceware password
+    DUNIKEYFILE="/home/$YOU/.zen/g1sms/$PHONE/secret.dunikey" # secret.dunikey
+	PUBKEYFILE="/home/$YOU/.zen/g1sms/$PHONE/_pub" # Contains phone wallet public key (RIB)
+	UNITFILE="/home/$YOU/.zen/g1sms/$PHONE/_unit" # Contains phone wallet prefered unit (LOVE,G1,DU)
 
-	RIBFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidrib" # Contains phone wallet related UID Pubkey
-	NAMEFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidname" # Contains the member UID related to wallet
-	MAILFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_email" # Contains the member EMAIL (Send BILLET)
-	GPGMAILFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_email.gpg" # Contains the member EMAIL (Send BILLET)
-	UIDNAFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidna" # Contains the G1sms+ UID Name for recursive VIR
-	GEOFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/_uidgeo.json" # Contains the member GeoPoint from member Cesium+ related to wallet
+	RIBFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidrib" # Contains phone wallet related UID Pubkey
+	NAMEFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidname" # Contains the member UID related to wallet
+	MAILFILE="/home/$YOU/.zen/g1sms/$PHONE/_email" # Contains the member EMAIL (Send BILLET)
+	GPGMAILFILE="/home/$YOU/.zen/g1sms/$PHONE/_email.gpg" # Contains the member EMAIL (Send BILLET)
+	UIDNAFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidna" # Contains the G1sms+ UID Name for recursive VIR
+	GEOFILE="/home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json" # Contains the member GeoPoint from member Cesium+ related to wallet
 
-    RECFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS" # File showing recurrent payements are left to be done with this G1sms Wallet
-    GPGRECFILE="/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg" # Cypher file with IPFSPrivKey (Node .Identity.PrivKey)
+    RECFILE="/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS" # File showing recurrent payements are left to be done with this G1sms Wallet
+    GPGRECFILE="/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg" # Cypher file with IPFSPrivKey (Node .Identity.PrivKey)
 
-    DABUIDF="/home/$YOU/.zen/g1sms_wallets/$PHONE/uidna.G1TAGNODE" # Contains G1Dab Name
+    DABUIDF="/home/$YOU/.zen/g1sms/$PHONE/uidna.G1TAGNODE" # Contains G1Dab Name
     # GET CURRENT NODE UIDNA (default DABUID)
     NODEUIDNA=$(cat /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna)
 ######################################################################
@@ -261,7 +261,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 	if [ ! -f "$PINFILE" ]; then
         # NOSMS mode?
 		if [[ $2 == "NOSMS" ]]; then UNKNOWN="unknown"; return; fi
-		mkdir -p /home/$YOU/.zen/g1sms_wallets/$PHONE/
+		mkdir -p /home/$YOU/.zen/g1sms/$PHONE/
         
         #######################
 		# GIVE NAME TO WALLET
@@ -283,7 +283,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 		PIN=$(/home/$YOU/.zen/astroport/zen/tools/diceware.sh | xargs)
 
         python3 /home/$YOU/.zen/astroport/zen/tools/key_create_dunikey.py "$UIDNA" "$PIN" ## Copy PubSec file to /tmp/secret.dunikey
-		mv /tmp/secret.dunikey /home/$YOU/.zen/g1sms_wallets/$PHONE/
+		mv /tmp/secret.dunikey /home/$YOU/.zen/g1sms/$PHONE/
         PUBKEY=$(cat $DUNIKEYFILE | grep 'pub:' | cut -d ' ' -f 2)
 
         log "__SUB:sms_INIT_ACCOUNT: !! G1 Wallet CREATED: $PHONE = $UIDNA $PIN : $PUBKEY"
@@ -299,7 +299,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 		log "__SUB:sms_INIT_ACCOUNT: G1 Wallet TX IN: $TX_IN"
 		sleep 2
         
-		TX_OUT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output $NODE_G1PUBKEY --amount 0.1 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY:ACK" -y)
+		TX_OUT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output $NODE_G1PUBKEY --amount 0.1 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY:ACK" -y)
 		log "__SUB:sms_INIT_ACCOUNT: G1 Wallet TX OUT: $TX_OUT"
 
         ################
@@ -315,8 +315,6 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 		echo "$COIN" > "$UNITFILE"
         echo "$MASTERPHONE" > "$SMSNODE"
 
-        # ADD WALLET TO IPFS
-        I=$(ipfs_node_wallets_add)
 	fi
 
 
@@ -461,13 +459,14 @@ function add_contact(){
 
 	[[ -z $($sql "SELECT * FROM pbk_groups WHERE ID='1'") ]] && $sql "INSERT INTO pbk_groups (ID, Name, id_user, is_public) VALUES ('1', '$(grep "ADRESSE" $MY_PATH/../.profile | awk -F= '{ print $2 }' | tr -d '"')', '1', 'false')"
 
-	if [[ -z $($sql "SELECT * FROM pbk WHERE Number=$PHONE") ]]; then
-		$sql "INSERT INTO pbk (GroupID, Name, Number, id_user, is_public) VALUES ('1', '$MEMBERUID', '$PHONE', '1', 'false')" || exit 1
-		local id_user=$($sql "SELECT ID FROM pbk WHERE Number=$PHONE" || exit 1)
-		$sql "INSERT INTO user_group (id_group, id_pbk, id_pbk_groups, id_user) VALUES ('$id_user', '$id_user', '1', '1')" || exit 1
-	else
-		log "${red}Contact already exist$c_"
+	if [[ $($sql "SELECT * FROM pbk WHERE Number=$PHONE") ]]; then
+        $sql "DELETE FROM pbk WHERE Number=$PHONE" || exit 1
+		$sql "DELETE FROM user_group WHERE id_group='$id_user'" || exit 1
+		log "${red}Contact already exist refreshing$c_"
 	fi
+    $sql "INSERT INTO pbk (GroupID, Name, Number, id_user, is_public) VALUES ('1', '$MEMBERUID', '$PHONE', '1', 'false')" || exit 1
+    local id_user=$($sql "SELECT ID FROM pbk WHERE Number=$PHONE" || exit 1)
+    $sql "INSERT INTO user_group (id_group, id_pbk, id_pbk_groups, id_user) VALUES ('$id_user', '$id_user', '1', '1')" || exit 1
 
 }
 
diff --git a/g1sms/init.sh b/g1sms/init.sh
index 0de39b0..419e297 100755
--- a/g1sms/init.sh
+++ b/g1sms/init.sh
@@ -89,7 +89,7 @@ export ADMINPHONE="+33647683646"
 export ADMINPSEUDO="Fred"
 ##################################################################
 # DUNITER/CESIUM+ DEFAULT SERVERS
-export DUNITER="https://g1.duniter.org"
+export DUNITER="https://duniter-g1.p2p.legal"
 export CESIUM="https://g1.data.le-sou.org"
 ##################################################################
 # DU has a G1 value changed every 6 month!
diff --git a/g1sms/init_keys.sh b/g1sms/init_keys.sh
index fb4bc62..bc8cede 100755
--- a/g1sms/init_keys.sh
+++ b/g1sms/init_keys.sh
@@ -35,7 +35,7 @@ $NANODATE
 /_/_/ /_/_/\__/  /_/|_|\___/\__, /____/  
                            /____/        
 
-I am $(whoami) on $IPFSNODEID
+I am $YOU on $IPFSNODEID
 
 "
 
@@ -58,7 +58,7 @@ if [[ ! -f /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna ]]; then
     
     ####################################################################
     # GIVE NAME TO NODE G1 WALLET: "6789diceware"
-    # And write /home/$YOU/.zen/g1sms_wallets/.Qm***/G1SSB/(_files)
+    # And write /home/$YOU/.zen/g1sms/.Qm***/G1SSB/(_files)
     ####################################################################
     PRE=${ADMINPHONE:8:4}
     ZUID=$(/home/$YOU/.zen/astroport/zen/tools/diceware.sh 1 | xargs)
@@ -77,7 +77,6 @@ $NODE_UIDNA
 "       
     if [[ -f /home/$YOU/.zen/secret.astroport.key ]]; then
         #[[ ! $(cat /home/$YOU/.zen/secret.astroport.key | grep -F 'NODE_UIDNA' )]] 
-        echo "IPFSNODEID=$IPFSNODEID" >> /home/$YOU/.zen/secret.astroport.key
         echo "NODE_UIDNA=$NODE_UIDNA" >> /home/$YOU/.zen/secret.astroport.key
     else
         echo "ERROR NO /home/$YOU/.zen/secret.astroport.key !!" && exit 1
diff --git a/g1sms/sms_ADMIN.sh b/g1sms/sms_ADMIN.sh
index 9e77799..ca6ec62 100755
--- a/g1sms/sms_ADMIN.sh
+++ b/g1sms/sms_ADMIN.sh
@@ -37,7 +37,7 @@ case "$CMD" in
 
 	MEM)
         log "__SUB:sms_ADMIN.sh: Send $MESSAGE message to All NODE members"
-        for f in /home/$YOU/.zen/g1sms_wallets/*/_uidname; do
+        for f in /home/$YOU/.zen/g1sms/*/_uidname; do
             uid=$(cat $f);
             num=$(echo $f | cut -d '/' -f 6);
             if [[ "$num" == "$ADMINPHONE" || "$num" == "$MASTERPHONE" ]]; then continue; fi
@@ -45,19 +45,19 @@ case "$CMD" in
     		sms_SEND "$num" "$uid, $MESSAGE"
             sleep 5
         done
-        sms_SEND "$ADMINPHONE" "ADMIN! Message envoyé aux $(cat /home/$YOU/.zen/g1sms_wallets/*/*.uidname | wc -l) membres de ce NODE"
+        sms_SEND "$ADMINPHONE" "ADMIN! Message envoyé aux $(cat /home/$YOU/.zen/g1sms/*/*.uidname | wc -l) membres de ce NODE"
 		;;
 
 	ALL)
         log "__SUB:sms_ADMIN.sh: Send $MESSAGE message to All NODE G1sms wallets"
-        for f in /home/$YOU/.zen/g1sms_wallets/*; do
+        for f in /home/$YOU/.zen/g1sms/*; do
             num=$(echo $f | cut -d '/' -f 6);
             if [[ "$num" == "$ADMINPHONE" || "$num" == "$MASTERPHONE" ]]; then continue; fi
             log "__SUB:sms_ADMIN.sh: Send SMS to $num"
     		sms_SEND "$num" "$MESSAGE"
             sleep 5
         done
-        sms_SEND "$ADMINPHONE" "ADMIN! Message envoyé aux $(ls /home/$YOU/.zen/g1sms_wallets/ | cut -d '/' -f3 | wc -l) possesseur de G1sms Wallets de ce NODE"
+        sms_SEND "$ADMINPHONE" "ADMIN! Message envoyé aux $(ls /home/$YOU/.zen/g1sms/ | cut -d '/' -f3 | wc -l) possesseur de G1sms Wallets de ce NODE"
 		;;
 
 	*)
diff --git a/g1sms/sms_ASTROPORT.sh b/g1sms/sms_ASTROPORT.sh
index b1ce8de..1d759a5 100755
--- a/g1sms/sms_ASTROPORT.sh
+++ b/g1sms/sms_ASTROPORT.sh
@@ -61,7 +61,7 @@ for hashfile in $(ls /tmp/loveland_entrance/); do
 
     echo "Astroport Ajax Request received $PP"
     
-    if [[ ! -f /home/$YOU/.zen/g1sms_wallets/$PHONE/_pub ]]; then
+    if [[ ! -f /home/$YOU/.zen/g1sms/$PHONE/_pub ]]; then
         # PHONE IS UNKNOW !
         # CHECK for Associated PARRAIN. GET PubKey?
         PARRAIN=$(echo "$PARRAIN" | grep -E "([A-Za-z0-9\-\_]+$)")
@@ -73,7 +73,7 @@ for hashfile in $(ls /tmp/loveland_entrance/); do
     else
         # ACCOUNT ALREADY EXISTING
         # Get AMOUNTG1, AMOUNTLOVE, AMOUNTDU
-        PUBKEY=$(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/_pub)
+        PUBKEY=$(cat /home/$YOU/.zen/g1sms/$PHONE/_pub)
         AMOUNTG1=$(silkaj_balance $PUBKEY)
         AMOUNTDU=$(bc -l <<< "scale=2; $AMOUNTG1 / $DUFACTOR")
         AMOUNTLOVE=$(bc -l <<< "scale=0; $AMOUNTG1 * 100 / $DUFACTOR")
@@ -96,6 +96,6 @@ for hashfile in $(ls /tmp/loveland_entrance/); do
 done
 
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 exit 0
diff --git a/g1sms/sms_AUTH.sh b/g1sms/sms_AUTH.sh
index b6bd6f6..a51f641 100755
--- a/g1sms/sms_AUTH.sh
+++ b/g1sms/sms_AUTH.sh
@@ -54,7 +54,7 @@ Insuffisant (minimum $VIR G1 + $LIMIT G1)"
 	echo "Minimum $VIR G1 + $LIMIT G1"
 fi
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 log "__SUB:sms_AUTH.sh: END sms_AUTH.sh "
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLET.sh b/g1sms/sms_BILLET.sh
index 1c49d50..872106b 100755
--- a/g1sms/sms_BILLET.sh
+++ b/g1sms/sms_BILLET.sh
@@ -103,7 +103,7 @@ then
 		sleep 3
 		# Fill BILLET with TRANSAC amount
         duniter_server=$(./tools/duniter_getnode.sh)
-        PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$BILLETPUBKEY" --amount "$TRANSAC" --comment "[G1sms+] G1Billet $NUMBER" -y)
+        PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$BILLETPUBKEY" --amount "$TRANSAC" --comment "[G1sms+] G1Billet $NUMBER" -y)
         if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" ]]; then
 			# NOTES ARE FILES STORED IN DICEWARE COMPOSED SUBDIR
 			echo "$(date +%Y%m%d)" > "/home/$YOU/.zen/g1billets/$bpath/note.creationdate"
@@ -137,7 +137,7 @@ then
 
 	# + G1SMS Commission
 	sleep 2
-    COM=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$BILLCOM" --comment "[G1sms+] Achat G1Billets" -y)
+    COM=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$BILLCOM" --comment "[G1sms+] Achat G1Billets" -y)
 
 	# POUR IMPRIMER LES BILLETS! Brancher votre imprimante, configurer cups, activer code lp ;)
 	num=$(date +%Y%m%d)
@@ -179,7 +179,7 @@ Insuffisant pour créer $NBbillets billet(s) de $VALbillet $UNIT
 https://g1.duniter.fr/api/#/v1/payment/$PUBKEY?amount=$VIR"	
 fi
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$phone
 
 log "__SUB:sms_BILLET.sh: END sms_BILLET.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLETCHK.sh b/g1sms/sms_BILLETCHK.sh
index ef2fbd2..b90d151 100755
--- a/g1sms/sms_BILLETCHK.sh
+++ b/g1sms/sms_BILLETCHK.sh
@@ -85,7 +85,7 @@ else
 	sms_SEND "$PHONE" "BILLET \"$CODE\" INCONNU !!"
 fi
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 log "END sms_BILLETCHK.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLET_MAKE.sh b/g1sms/sms_BILLET_MAKE.sh
index e73d1e2..7533649 100755
--- a/g1sms/sms_BILLET_MAKE.sh
+++ b/g1sms/sms_BILLET_MAKE.sh
@@ -52,9 +52,9 @@ valid="0${valid:0:2}"
 # ADD VALIDITY to convert: -pointsize 20 -draw 'text 380,410 "'"A encaisser avant le 01/$valid/$year"'"' \
 
 # ADD Avatar on G1 Logo SouthEast
-if [[ $(file "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" | grep 'PNG') ]]; then
-    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" "$MY_PATH/Oeuro.jpg" "/tmp/$NUMERO.jpg"
-    composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
+if [[ $(file "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png" | grep 'PNG') ]]; then
+    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png" "$MY_PATH/Oeuro.jpg" "/tmp/$NUMERO.jpg"
+    composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
 else
     composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "$MY_PATH/G1Anar.png" "$MY_PATH/Oeuro.jpg" "/tmp/$NUMERO.jpg"
     composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "$MY_PATH/G1Anar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
diff --git a/g1sms/sms_COUNT.sh b/g1sms/sms_COUNT.sh
index 47dd40a..6edbc9c 100755
--- a/g1sms/sms_COUNT.sh
+++ b/g1sms/sms_COUNT.sh
@@ -28,7 +28,7 @@ AMOUNT=${accounting[1]}
 UNIT=${accounting[2]}
 
 # SEARCH FOR VIREMENT
-if [[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg ]]; then
+if [[ -f /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg ]]; then
     echo "FOUND $file decrypting with Node key"
     echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/VIREMENTS.$PHONE" --yes --pinentry-mode loopback --passphrase-fd 0 "$file"
     declare -a LIST
@@ -74,7 +74,7 @@ else
 	echo $AMOUNTG1
 fi
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 log "END sms_COUNT.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_DESTROY.sh b/g1sms/sms_DESTROY.sh
index 61e530c..35a4a0e 100755
--- a/g1sms/sms_DESTROY.sh
+++ b/g1sms/sms_DESTROY.sh
@@ -12,10 +12,10 @@ PHONE="$1"
 MEMBERUID="$2"
 TODAY=$(date '+%Y%m%d')
 
-if [[ -f "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS" ]]; then
+if [[ -f "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS" ]]; then
 # CHECK IF ALL DONE.
-    log "__SUB:sms_DESTROY.sh: FOUND "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS" decrypting with Node key"
-    echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/VIREMENTS.$PHONE" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg"
+    log "__SUB:sms_DESTROY.sh: FOUND "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS" decrypting with Node key"
+    echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/VIREMENTS.$PHONE" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg"
     for next in $(cat /tmp/VIREMENTS.$PHONE | cut -d ' ' -f 1); do
         if [[ $next -ge $TODAY ]]; then
             log "__SUB:sms_DESTROY.sh: VIREMENT $next >= $TODAY"
@@ -37,9 +37,9 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
     AMOUNTG1=$(silkaj_balance $PUBKEY)
     GETLIMIT=$(bc <<< "$AMOUNTG1 - $LIMIT")
     duniter_server=$(./tools/duniter_getnode.sh)
-    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$MEMRIB" --amount "$GETLIMIT" --comment "[G1sms+] Wallet DESTROY $MEMBER $MEMBERUID" -y)
+    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$MEMRIB" --amount "$GETLIMIT" --comment "[G1sms+] Wallet DESTROY $MEMBER $MEMBERUID" -y)
     sleep 5
-    back=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
+    back=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
 
     # TODO DEBUG :: echo $PAY
     if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" && "$(echo $back | grep 'successful')" != "" ]]; then
@@ -56,7 +56,7 @@ $ADMINPSEUDO @ $NODEUIDNA
 $back"
 sms_SEND "$PHONE" "$mess"
 
-            rm -Rf /home/$YOU/.zen/g1sms_wallets/$PHONE;
+            rm -Rf /home/$YOU/.zen/g1sms/$PHONE;
             rm -Rf /home/$YOU/.zen/ipfs/$(echo -n $PHONE | sha256sum | cut -d ' ' -f 1)@$(echo -n $MASTERPHONE | sha256sum | cut -d ' ' -f 1)
             log "__SUB:sms_DESTROY.sh: WALLET DESTROYED : $PHONE / $UIDNA / $MEMBER : ${c_green}OK$c_"
         fi
diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh
index 484d057..f20282e 100755
--- a/g1sms/sms_EMAIL.sh
+++ b/g1sms/sms_EMAIL.sh
@@ -17,7 +17,7 @@ log "__SUB:sms_EMAIL.sh.sh: START ($1=phone, $2=mail)"
 phone="$1"
 mail="$2"
 
-MAILFILE="/home/$YOU/.zen/g1sms_wallets/$phone/_email" # Contains the member EMAIL (Send BILLET)
+MAILFILE="/home/$YOU/.zen/g1sms/$phone/_email" # Contains the member EMAIL (Send BILLET)
 
 # Initialise PHONE, PIN, PUBKEY, UNIT ...
 sms_INIT_ACCOUNT "$phone" "NOSMS"
@@ -52,7 +52,7 @@ Mettez le à jour, si cela est nécessaire..."
 
 sms_SEND "$phone" "$mess"
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 log "END sms_EMAIL.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_G1TAG.sh b/g1sms/sms_G1TAG.sh
index 3b39e04..e06cd57 100755
--- a/g1sms/sms_G1TAG.sh
+++ b/g1sms/sms_G1TAG.sh
@@ -14,7 +14,7 @@
 #
 # TAG 250 => Imprime un G1Tag rempli de 250 UNIT
 # TAG 2 100 => Imprime 100 G1Tag BON de 2 UNIT
-# PHONE any /home/$YOU/.zen/g1sms_wallets/IDs
+# PHONE any /home/$YOU/.zen/g1sms/IDs
 # TODO: for multi-channel -> Use HASHLINK + UIDNA + NODE_UIDNA + AMOUNT ...
 ###########################################################################################
 source ./init.sh
@@ -73,8 +73,8 @@ fi
 
 ##### IS G1DAB NODE?
 if [[ ! $PASSENGER && ! $G1DAB ]]; then
-    if [[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE ]]; then
-        DABnode=$(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE)
+    if [[ -f /home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE ]]; then
+        DABnode=$(cat /home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE)
         if [[ "$DABnode" == "$IPFSNODEID" ]]; then
         	sms_ERROR "$PHONE" "IMPRIMANTE G1Tag sur $DABnode non détectée!! Choisissez un autre G1Dab..."
             log "__SUB:sms_G1TAG.sh: IMPRIMANTE G1Tag non détectée!!"
@@ -84,7 +84,7 @@ if [[ ! $PASSENGER && ! $G1DAB ]]; then
 fi
 
 # TODO: SEARCH PROXIMITY DAB LOCATION (GeoPoint + GPS)...
-#    for node in /home/$YOU/.zen/g1sms_wallets_swarm/.*/*.where; do
+#    for node in /home/$YOU/.zen/g1sms_swarm/.*/*.where; do
 #    done
 ###########################################################
 # silkaj NODE CHANGE !!!
@@ -95,7 +95,7 @@ fi
 # PAY VIR + PERCENT G1
 ML=$(bc -l <<< "scale=2; $VIR + $PERCENT")
 duniter_server=$(./tools/duniter_getnode.sh)
-PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$ML" --comment "[G1sms+] ACHAT $3 G1Tag(s) - $2 $UNIT" -y)
+PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$ML" --comment "[G1sms+] ACHAT $3 G1Tag(s) - $2 $UNIT" -y)
 if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
     sms_ERROR "$PHONE" "$PAY";
     exit
@@ -224,8 +224,8 @@ TAGCHAIN="./TAG/${RR}/TAG_chain" # contains IPFS current ipfs hash
     composite -compose Over -gravity SouthEast "./TAG/${RR}/TAG_WRITE.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
 
     # ADD Avatar in the Center
-#    if [[ $(file "/home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
-#        composite -compose Over -resize 150% -gravity Center "/home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.avatar.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
+#    if [[ $(file "/home/$YOU/.zen/g1sms/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
+#        composite -compose Over -resize 150% -gravity Center "/home/$YOU/.zen/g1sms/$PHONE/$PHONE.avatar.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
 #    else
 #        composite -compose Over -resize 100% -gravity Center "./G1Anar.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
 #    fi
@@ -241,23 +241,23 @@ TAGCHAIN="./TAG/${RR}/TAG_chain" # contains IPFS current ipfs hash
     # convert "./TAG/${RR}/${RR}.png" -rotate -180 "./TAG/${RR}/${RR}.png"
     # QL-700 PRINT PREPARE
     
-    if [[ -f "/home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE" ]]; then
-        destnode=$(cat "/home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE")
+    if [[ -f "/home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE" ]]; then
+        destnode=$(cat "/home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE")
         if [[ "$destnode" == "" || "$destnode" == "$IPFSNODEID" ]]; then
             log "__SUB:sms_G1TAG.sh: Local PRINT ${RR} # ipfs ls /ipns/${J}"
             brother_ql_create --model QL-700 "./TAG/${RR}/${RR}.png" --label-size 62 > "./TAG/${RR}/${RR}.bin"
             brother_ql_print "./TAG/${RR}/${RR}.bin" /dev/usb/lp0
         else 
         # PRINT ON ANOTHER G1Dab. Send files to G1Tag Printer TODO: Could use DESTNODEPUB instead of NODE_G1PUBKEY ?
-            log "__SUB:sms_G1TAG.sh: Remote PRINT :: /home/$YOU/.zen/g1sms_wallets/.$destnode/PRINT/${RR}.bin "
-            mkdir -p "/home/$YOU/.zen/g1sms_wallets/.$destnode/PRINT/"
+            log "__SUB:sms_G1TAG.sh: Remote PRINT :: /home/$YOU/.zen/g1sms/.$destnode/PRINT/${RR}.bin "
+            mkdir -p "/home/$YOU/.zen/g1sms/.$destnode/PRINT/"
             # TODO: USE $DEST_G1PUBKEY is better
-            /home/$YOU/.zen/astroport/zen/tools/natools.py encrypt -p $NODE_G1PUBKEY -i "./TAG/${RR}/${RR}.png" -o "/home/$YOU/.zen/g1sms_wallets/.$destnode/PRINT/${RR}.bin"
+            /home/$YOU/.zen/astroport/zen/tools/natools.py encrypt -p $NODE_G1PUBKEY -i "./TAG/${RR}/${RR}.png" -o "/home/$YOU/.zen/g1sms/.$destnode/PRINT/${RR}.bin"
         fi
     else
         # 
         log "__SUB:sms_G1TAG.sh: Becoming default PRINTER :: $IPFSNODEID"
-        echo "$IPFSNODEID" > "/home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE"
+        echo "$IPFSNODEID" > "/home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE"
         brother_ql_create --model QL-700 "./TAG/${RR}/${RR}.png" --label-size 62 > "./TAG/${RR}/${RR}.bin"
         brother_ql_print "./TAG/${RR}/${RR}.bin" /dev/usb/lp0
         destnode="$IPFSNODEID"
@@ -269,14 +269,14 @@ done
 # PRINT $PHONE WALLET PUBKEY
 ####################################################
 if [[ "$destnode" == "" || "$destnode" == "$IPFSNODEID" ]]; then
-    qrencode -s 5 -o "/tmp/G1PubQR.$PHONE.png" "$(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.pub)"
+    qrencode -s 5 -o "/tmp/G1PubQR.$PHONE.png" "$(cat /home/$YOU/.zen/g1sms/$PHONE/$PHONE.pub)"
     composite -compose Over -gravity West "/tmp/G1PubQR.$PHONE.png" "./g1tag.png" "/tmp/G1PubQR.$PHONE.png"
 
-    if [[ $(file "/home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
-        composite -compose Over -gravity Center "/home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.avatar.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
+    if [[ $(file "/home/$YOU/.zen/g1sms/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
+        composite -compose Over -gravity Center "/home/$YOU/.zen/g1sms/$PHONE/$PHONE.avatar.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
     fi
-    if [[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.uidrib ]]; then
-        qrencode -s 6 -o "/tmp/G1MemQR.$PHONE.png" "$(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/$PHONE.uidrib)";
+    if [[ -f /home/$YOU/.zen/g1sms/$PHONE/$PHONE.uidrib ]]; then
+        qrencode -s 6 -o "/tmp/G1MemQR.$PHONE.png" "$(cat /home/$YOU/.zen/g1sms/$PHONE/$PHONE.uidrib)";
         composite -compose Over -gravity SouthEast "/tmp/G1MemQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png" && rm /tmp/G1MemQR.$PHONE.png
     fi
 
diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh
index c6ed6f7..20cc8e7 100755
--- a/g1sms/sms_NEW.sh
+++ b/g1sms/sms_NEW.sh
@@ -56,7 +56,7 @@ sms_SEND "$PHONE" "$PUBKEY"
 [[ $MEMRIB != "" ]] && sms_SEND "$PHONE" "Compte Atttaché: $MEMBER $SMSEMAIL
 $MEMRIB"
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 # Add contact to database (TODO REFRESH Member Name in SQL)
 add_contact $PHONE $MEMBERUID && log "${c_green}Contact has been added to database$c_" || log "${c_red}Contact can't be added to database$c_"
diff --git a/g1sms/sms_PAY.sh b/g1sms/sms_PAY.sh
index 2866bc2..bbb9364 100755
--- a/g1sms/sms_PAY.sh
+++ b/g1sms/sms_PAY.sh
@@ -55,7 +55,7 @@ fi
 
 duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
 # Payement
-PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$PUBKEYDEST" --amount "$VIR" --comment "[G1sms+] PAY" -y)
+PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$PUBKEYDEST" --amount "$VIR" --comment "[G1sms+] PAY" -y)
 if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
     sms_ERROR "$phone" "Problème de payement $PAY";
     log "__SUB:sms_PAY.sh: Problème $PAY"
@@ -65,7 +65,7 @@ fi
 sleep 2
 
 # + G1SMS Commission
-COM=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$PERCENT" --comment "[G1sms+] Commission" -y)
+COM=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$PERCENT" --comment "[G1sms+] Commission" -y)
 if [[ "$(echo $COM | grep 'successful')" == "" || "$PAY" == "" ]]; then
     sms_ERROR "$phone" "Problème de payement $COM";
     log "__SUB:sms_PAY.sh: Problème $COM"
@@ -88,8 +88,8 @@ Envoyez D pour (D)étail.
 A pour (A)ide..."
 sms_SEND "$PHONEDEST" "$mess_dest"
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONEDEST ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONEDEST
-[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms/$PHONEDEST ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONEDEST
+[[ -d /home/$YOU/.zen/g1sms/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$phone
 
 log "__SUB:sms_PAY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~ "
 exit
diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh
index eb1705b..8db3209 100755
--- a/g1sms/sms_REC.sh
+++ b/g1sms/sms_REC.sh
@@ -3,7 +3,7 @@
 # Author: Fred (support@qo-op.com)
 # Version: 1.0
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-# RECORD RECURRENT PAYEMENTS WITH "Cesium+ ID" Pubkey TODO cron /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS, Fusion avec sms_VIR.sh
+# RECORD RECURRENT PAYEMENTS WITH "Cesium+ ID" Pubkey TODO cron /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS, Fusion avec sms_VIR.sh
 ################################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
@@ -82,22 +82,22 @@ else
     log "__SUB:sms_VIR.sh: SEARCH $VIRDEST related wallet!!! $DESTRIB "
 	DESTMEM="$VIRDEST"
 	# SEARCH IN WALLETS
-	LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets/*/_uidname | tail -n 1 | cut -f 6 -d '/')
-    if [[ "$LOCAL" == "" ]]; then LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets/*/_uidna | tail -n 1 | cut -f 6 -d '/'); fi
+	LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms/*/_uidname | tail -n 1 | cut -f 6 -d '/')
+    if [[ "$LOCAL" == "" ]]; then LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms/*/_uidna | tail -n 1 | cut -f 6 -d '/'); fi
 	if [[ "$LOCAL" != "" ]]; then
 		# LOCAL G1sms account
-		DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets/$LOCAL/_pub)
+		DESTRIB=$(cat /home/$YOU/.zen/g1sms/$LOCAL/_pub)
 		DESTPHONE=$LOCAL
 		log "__SUB:sms_VIR.sh: FOUND LOCAL ($MASTERPHONE) G1sms+ wallet: $DESTRIB ($LOCAL)"
 	else
 
     ##################### REWRITE TODO 
         # SEARCH IN WALLETS SWARM (MEMBER THEN UIDNA)
-#        INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/')
-#        if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/');  fi
+#        INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/')
+#        if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/');  fi
 #        if [[ "$INSWARM" != "" ]]; then
-#           REMOTENODE=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/MASTERPHONE.sms)
-#		    DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/$INSWARM.pub)
+#           REMOTENODE=$(cat /home/$YOU/.zen/g1sms_swarm/$INSWARM/MASTERPHONE.sms)
+#		    DESTRIB=$(cat /home/$YOU/.zen/g1sms_swarm/$INSWARM/$INSWARM.pub)
 #		    DESTPHONE=$INSWARM
 #		    log "__SUB:sms_VIR.sh: FOUND SWARM ($REMOTENODE) G1sms+ wallet: $DESTRIB ($INSWARM)"            
 #        else
@@ -113,18 +113,18 @@ fi
 if [[ "$DESTRIB" != "" ]]; then
     duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
     log "__SUB:sms_REC.sh: TRAITEMENT DU VIREMENT DE $AMOUNT $UNIT = 1ER VIREMENT de $VIR G1 vers $VIRDEST ($DESTRIB) $TIME FOIS. OK..."
-    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] REC 1/$TIME ($PERIOD)" -y)
+    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] REC 1/$TIME ($PERIOD)" -y)
 	if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
         sms_ERROR "$PHONE" "Problème de payement $PAY";
         log "__SUB:sms_REC.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
         exit 1
     fi
-    log "__SUB:sms_REC.sh: UPDATE /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS with FUTURE PAYEMENTS? $PAY"
+    log "__SUB:sms_REC.sh: UPDATE /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS with FUTURE PAYEMENTS? $PAY"
 
-    ########### MAKE /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS for NEXT ONES
-    if [[ -f "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg" ]]; then
+    ########### MAKE /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS for NEXT ONES
+    if [[ -f "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg" ]]; then
         # DECYPHER FILE FOR CHANGE
-        echo "${IPFSPrivKey}" | gpg -d -q --output "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg"
+        echo "${IPFSPrivKey}" | gpg -d -q --output "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg"
     fi
     # WRITE NEW LINES INTO AN ARRAY FILE: VIREMENTS
     boucle=$((TIME - 1))
@@ -134,14 +134,14 @@ if [[ "$DESTRIB" != "" ]]; then
         $((num ++))
         NEXT=$(date --date="$num $NEXTDATE" '+%Y%m%d')
         # ADD NEW LINE IN VIREMENTS
-        echo "$NEXT $MEMBER $PHONE $VIR $DESTRIB $DESTMEM $MEMBER#$TIME#$AMOUNT#$DESTMEM $boucle " >> /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS
+        echo "$NEXT $MEMBER $PHONE $VIR $DESTRIB $DESTMEM $MEMBER#$TIME#$AMOUNT#$DESTMEM $boucle " >> /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS
 
     done 
     # CYPHER FILE
-    echo "${IPFSPrivKey}" | gpg -q --output "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS.gpg" --yes --pinentry-mode loopback --symmetric --passphrase-fd 0 "/home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS"
+    echo "${IPFSPrivKey}" | gpg -q --output "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS.gpg" --yes --pinentry-mode loopback --symmetric --passphrase-fd 0 "/home/$YOU/.zen/g1sms/$PHONE/VIREMENTS"
     # EMPTY CLEAR FILE
-    log "__SUB:sms_REC.sh: $(cat /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS)"
-    echo "" > /home/$YOU/.zen/g1sms_wallets/$PHONE/VIREMENTS
+    log "__SUB:sms_REC.sh: $(cat /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS)"
+    echo "" > /home/$YOU/.zen/g1sms/$PHONE/VIREMENTS
     ########### 
 
     log "__SUB:sms_REC.sh: .....................................OK!!!"
@@ -162,7 +162,7 @@ $DESTRIB"
 		sms_SEND "$DESTPHONE" "[G1sms+] Bonjour $DESTMEM. Vous recev(r)ez un payement de $VIR G1 (pendant $TIME $PERIOD) de la part du portefeuille: $MEMBER $UIDNA."
 	fi
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 else
 	log "__SUB:sms_REC.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND"
diff --git a/g1sms/sms_SETUNIT.sh b/g1sms/sms_SETUNIT.sh
index 6090be3..5597a96 100755
--- a/g1sms/sms_SETUNIT.sh
+++ b/g1sms/sms_SETUNIT.sh
@@ -13,7 +13,7 @@ log "X sms_SETUNIT.sh ($1=phone, $2=unit)"
 
 phone="$1"
 unit="$2"
-UNITFILE="/home/$YOU/.zen/g1sms_wallets/$phone/_unit"
+UNITFILE="/home/$YOU/.zen/g1sms/$phone/_unit"
 
 # Initialise PHONE, PIN, PUBKEY, UNIT, HIST
 sms_INIT_ACCOUNT "$phone" "NOSMS"
@@ -39,7 +39,7 @@ Unité de votre portefeuille: $unit"
 
 sms_SEND "$phone" "$mess"
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$phone
 
 log "END sms_SETUNIT.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh
index 29966f6..4ae9b12 100755
--- a/g1sms/sms_VIR.sh
+++ b/g1sms/sms_VIR.sh
@@ -51,22 +51,22 @@ else
     log "__SUB:sms_VIR.sh: SEARCH $VIRDEST related wallet!!! $DESTRIB "
 	DESTMEM="$VIRDEST"
 	# SEARCH IN WALLETS
-	LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets/*/_uidname | tail -n 1 | cut -f 6 -d '/')
-    if [[ "$LOCAL" == "" ]]; then LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets/*/_uidna | tail -n 1 | cut -f 6 -d '/'); fi
+	LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms/*/_uidname | tail -n 1 | cut -f 6 -d '/')
+    if [[ "$LOCAL" == "" ]]; then LOCAL=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms/*/_uidna | tail -n 1 | cut -f 6 -d '/'); fi
 	if [[ "$LOCAL" != "" ]]; then
 		# LOCAL G1sms account
-		DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets/$LOCAL/_pub)
+		DESTRIB=$(cat /home/$YOU/.zen/g1sms/$LOCAL/_pub)
 		DESTPHONE=$LOCAL
 		log "__SUB:sms_VIR.sh: FOUND LOCAL ($MASTERPHONE) G1sms+ wallet: $DESTRIB ($LOCAL)"
 	else
 
     ##################### REWRITE TODO 
         # SEARCH IN WALLETS SWARM (MEMBER THEN UIDNA)
-#        INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/')
-#        if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/');  fi
+#        INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/')
+#        if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/');  fi
 #        if [[ "$INSWARM" != "" ]]; then
-#           REMOTENODE=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/MASTERPHONE.sms)
-#		    DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/$INSWARM.pub)
+#           REMOTENODE=$(cat /home/$YOU/.zen/g1sms_swarm/$INSWARM/MASTERPHONE.sms)
+#		    DESTRIB=$(cat /home/$YOU/.zen/g1sms_swarm/$INSWARM/$INSWARM.pub)
 #		    DESTPHONE=$INSWARM
 #		    log "__SUB:sms_VIR.sh: FOUND SWARM ($REMOTENODE) G1sms+ wallet: $DESTRIB ($INSWARM)"            
 #        else
@@ -81,7 +81,7 @@ fi
 
 if [[ "$DESTRIB" != "" ]]; then
     duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
-    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $VIR G1" -y)
+    PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $VIR G1" -y)
 	if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" ]]; then
 		log "__SUB:sms_VIR.sh: VIREMENT VERS $DESTMEM OK"
 		mess="[G1sms+] $MEMBER
@@ -95,7 +95,7 @@ $PAY"
         sms_SEND "$ADMINPHONE" "$PAY";        
 	fi
     
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
     
 else
 	log "__SUB:sms_VIR.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND"
diff --git a/g1sms/sms_WHERE.sh b/g1sms/sms_WHERE.sh
index c3f4f2d..ac47188 100755
--- a/g1sms/sms_WHERE.sh
+++ b/g1sms/sms_WHERE.sh
@@ -4,7 +4,7 @@
 # Version: 1.0
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
 ################################################################################
-# is there ADMINPSEUDO-UIDNATAIL in /home/$YOU/.zen/g1sms_wallets_swarm/.*/*.uidna ?"
+# is there ADMINPSEUDO-UIDNATAIL in /home/$YOU/.zen/g1sms_swarm/.*/*.uidna ?"
 source ./init.sh
 source ./functions.sh
 log "__SUB:sms_WHERE.sh: START ($1=PHONE $2=askeduidna)"
@@ -32,8 +32,8 @@ fi
 
 if [[ -f $nodeuidnafile && "$uidna" != "" ]]; then
     ipfsnodeid=$(echo $nodeuidnafile | cut -d '/' -f 6 | cut -d '.' -f 2 )
-    echo $uidna > /home/$YOU/.zen/g1sms_wallets/$PHONE/uidna.G1TAGNODE
-    echo $ipfsnodeid > /home/$YOU/.zen/g1sms_wallets/$PHONE/ipfsid.G1TAGNODE
+    echo $uidna > /home/$YOU/.zen/g1sms/$PHONE/uidna.G1TAGNODE
+    echo $ipfsnodeid > /home/$YOU/.zen/g1sms/$PHONE/ipfsid.G1TAGNODE
     log "__SUB:sms_WHERE.sh: Distributeur de G1Tag  $uidna : $ipfsnodeid "
 else
     log "__SUB:sms_WHERE.sh: ERROR Distributeur de G1Tag $askeduidna inconnu ???"
@@ -49,7 +49,7 @@ $(cat /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_where)"
 
 sms_SEND "$PHONE" "$mess"
 
-[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
 
 
 log "__SUB:sms_WHERE.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_received.sh b/g1sms/sms_received.sh
index 076c19d..550f98b 100755
--- a/g1sms/sms_received.sh
+++ b/g1sms/sms_received.sh
@@ -42,7 +42,7 @@ CMD=$(echo "$TEXT" | awk '{print toupper($1)}')
 ##################################################################
 # Check if PHONE is already registred in G1sms+ SWARM
 ##################################################################
-if [[ ! -f "/home/$YOU/.zen/g1sms_wallets/$PHONE/MASTERPHONE.sms" && "$CMD" != "ADMIN" ]]
+if [[ ! -f "/home/$YOU/.zen/g1sms/$PHONE/MASTERPHONE.sms" && "$CMD" != "ADMIN" ]]
 then
     HPHONE=$(echo -n $PHONE | sha256sum | cut -d ' ' -f 1)
     NODEPHONE=$(cat /home/$YOU/.zen/ipfs_swarm/$HPHONE@*/MASTERPHONE.sms 2>/dev/null)
@@ -53,7 +53,7 @@ then
     fi
 else
     # Refresh MasterPhone (usefull in case of MASTERPHONE SIM number change)
-    echo "$MASTERPHONE" > "/home/$YOU/.zen/g1sms_wallets/$PHONE/MASTERPHONE.sms"
+    echo "$MASTERPHONE" > "/home/$YOU/.zen/g1sms/$PHONE/MASTERPHONE.sms"
 fi
 
 ##################################################################
diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh
index 5905077..4f9b75a 100755
--- a/zen/tools/make_G1SSB_secret.sh
+++ b/zen/tools/make_G1SSB_secret.sh
@@ -260,7 +260,7 @@ sleep 1
 
 # CREATE SSB secret
 g1pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
-echo "ZENG1=\"$g1pub\"" >> ~/.zen/secret.astroport.key
+echo "G1PUB=\"$g1pub\"" >> ~/.zen/secret.astroport.key
 
 g1priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
 ssbpub=$(echo $g1pub | base58 -d | base64)
@@ -282,7 +282,7 @@ cat > ~/.ssb/secret <<EOF
 
 EOF
 
-echo "ZENSSB=\"@$ssbpub.ed25519\"" >> ~/.zen/secret.astroport.key
+echo "WHOAMI=\"@$ssbpub.ed25519\"" >> ~/.zen/secret.astroport.key
 
 echo "
  _