diff --git a/NTCNA/README.txt b/CarPi/README.txt
similarity index 100%
rename from NTCNA/README.txt
rename to CarPi/README.txt
diff --git a/NTCNA/etc/can.conf b/CarPi/etc/can.conf
similarity index 100%
rename from NTCNA/etc/can.conf
rename to CarPi/etc/can.conf
diff --git a/NTCNA/etc/dhcpcd.conf b/CarPi/etc/dhcpcd.conf
similarity index 100%
rename from NTCNA/etc/dhcpcd.conf
rename to CarPi/etc/dhcpcd.conf
diff --git a/NTCNA/etc/hosts b/CarPi/etc/hosts
similarity index 100%
rename from NTCNA/etc/hosts
rename to CarPi/etc/hosts
diff --git a/NTCNA/etc/ld.so.conf.d/cvehicle.conf b/CarPi/etc/ld.so.conf.d/cvehicle.conf
similarity index 100%
rename from NTCNA/etc/ld.so.conf.d/cvehicle.conf
rename to CarPi/etc/ld.so.conf.d/cvehicle.conf
diff --git a/NTCNA/etc/ld.so.conf.d/pstar.conf b/CarPi/etc/ld.so.conf.d/pstar.conf
similarity index 100%
rename from NTCNA/etc/ld.so.conf.d/pstar.conf
rename to CarPi/etc/ld.so.conf.d/pstar.conf
diff --git a/NTCNA/etc/rc.local b/CarPi/etc/rc.local
similarity index 100%
rename from NTCNA/etc/rc.local
rename to CarPi/etc/rc.local
diff --git a/NTCNA/etc/systemd/system/multi-user.target.wants/gpsd.service b/CarPi/etc/systemd/system/multi-user.target.wants/gpsd.service
similarity index 100%
rename from NTCNA/etc/systemd/system/multi-user.target.wants/gpsd.service
rename to CarPi/etc/systemd/system/multi-user.target.wants/gpsd.service
diff --git a/NTCNA/etc/systemd/system/sockets.target.wants/gpsd.socket b/CarPi/etc/systemd/system/sockets.target.wants/gpsd.socket
similarity index 100%
rename from NTCNA/etc/systemd/system/sockets.target.wants/gpsd.socket
rename to CarPi/etc/systemd/system/sockets.target.wants/gpsd.socket
diff --git a/NTCNA/home/pi/.config/lxsession/LXDE-pi/autostart b/CarPi/home/pi/.config/lxsession/LXDE-pi/autostart
similarity index 100%
rename from NTCNA/home/pi/.config/lxsession/LXDE-pi/autostart
rename to CarPi/home/pi/.config/lxsession/LXDE-pi/autostart
diff --git a/NTCNA/home/pi/.config/lxsession/LXDE-pi/desktop.conf b/CarPi/home/pi/.config/lxsession/LXDE-pi/desktop.conf
similarity index 100%
rename from NTCNA/home/pi/.config/lxsession/LXDE-pi/desktop.conf
rename to CarPi/home/pi/.config/lxsession/LXDE-pi/desktop.conf
diff --git a/NTCNA/home/pi/.config/lxsession/LXDE-pi/sshpwd.sh b/CarPi/home/pi/.config/lxsession/LXDE-pi/sshpwd.sh
similarity index 100%
rename from NTCNA/home/pi/.config/lxsession/LXDE-pi/sshpwd.sh
rename to CarPi/home/pi/.config/lxsession/LXDE-pi/sshpwd.sh
diff --git a/NTCNA/home/pi/.vnc/passwd b/CarPi/home/pi/.vnc/passwd
similarity index 100%
rename from NTCNA/home/pi/.vnc/passwd
rename to CarPi/home/pi/.vnc/passwd
diff --git a/NTCNA/lib/systemd/system/rc-local.service b/CarPi/lib/systemd/system/rc-local.service
similarity index 100%
rename from NTCNA/lib/systemd/system/rc-local.service
rename to CarPi/lib/systemd/system/rc-local.service
diff --git a/NTCNA/lib/systemd/system/x11vnc.service b/CarPi/lib/systemd/system/x11vnc.service
similarity index 100%
rename from NTCNA/lib/systemd/system/x11vnc.service
rename to CarPi/lib/systemd/system/x11vnc.service
diff --git a/NTCNA/rpi-setup.sh b/CarPi/rpi-setup.sh
similarity index 85%
rename from NTCNA/rpi-setup.sh
rename to CarPi/rpi-setup.sh
index d2b8dd8..666889b 100755
--- a/NTCNA/rpi-setup.sh
+++ b/CarPi/rpi-setup.sh
@@ -8,10 +8,7 @@ done
 cp -r home/pi/.* /home/pi/
 
 # network
-
-# Need rc.local to start CAN and BSMPd
-#sudo systemctl enable rc-local.service
-#sudo systemctl enable x11vnc.service
+echo "Networking installed, use WiFi for Internet"
 
 # update & clean
 sudo apt-get update
@@ -20,8 +17,11 @@ sudo apt-get install -y ntpdate subversion git cmake
 sudo apt-get -y autoremove
 sudo apt-get clean
 
-# enable GUI
-sudo systemctl set-default graphical.target
+# Need rc.local to start CAN and BSMPd
+sudo systemctl enable rc-local.service
+if [ ! -f /etc/init/x11vnc.conf ]; then
+  sudo systemctl enable x11vnc.service
+fi
 
 # time
 sudo ntpdate pool.ntp.org
@@ -95,3 +95,6 @@ chmod +x $HOME/PyVehicle/bin/*.sh
 
 # cleanup
 sudo raspi-config
+
+git config --global user.email "nprobert@probestar.net"
+git config --global user.name "Neal Probert"
diff --git a/NTCNA/rpi-update.sh b/CarPi/rpi-update.sh
similarity index 54%
rename from NTCNA/rpi-update.sh
rename to CarPi/rpi-update.sh
index be6630b..2dea805 100755
--- a/NTCNA/rpi-update.sh
+++ b/CarPi/rpi-update.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # copy config files
-sudo cp -r etc lib usr home /
+sudo cp -r etc lib usr /
 
-# Need rc.local to start CAN and BSMPd
+# Need rc.local?
 sudo systemctl enable rc-local.service
 
 # update
@@ -11,9 +11,6 @@ sudo ntpdate pool.ntp.org
 sudo hwclock -w
 
 # checkouts
+pstar-update.sh
 ntcna-update.sh
 
-# rebuild
-#cd $HOME/NTCNA/CVehicle
-#./build.sh
-#./install.sh
diff --git a/NTCNA/usr/local/bin/all-update.sh b/CarPi/usr/local/bin/all-update.sh
similarity index 100%
rename from NTCNA/usr/local/bin/all-update.sh
rename to CarPi/usr/local/bin/all-update.sh
diff --git a/NTCNA/usr/local/bin/ntcna-update.sh b/CarPi/usr/local/bin/ntcna-update.sh
similarity index 100%
rename from NTCNA/usr/local/bin/ntcna-update.sh
rename to CarPi/usr/local/bin/ntcna-update.sh
diff --git a/NTCNA/usr/local/bin/pstar-update.sh b/CarPi/usr/local/bin/pstar-update.sh
similarity index 100%
rename from NTCNA/usr/local/bin/pstar-update.sh
rename to CarPi/usr/local/bin/pstar-update.sh
diff --git a/NTCNA/usr/local/sbin/start_vnc.sh b/CarPi/usr/local/sbin/start_vnc.sh
similarity index 100%
rename from NTCNA/usr/local/sbin/start_vnc.sh
rename to CarPi/usr/local/sbin/start_vnc.sh