diff --git a/src/cmd/Command.go b/src/client/cmd/Command.go
similarity index 100%
rename from src/cmd/Command.go
rename to src/client/cmd/Command.go
diff --git a/src/cmd/go.mod b/src/client/cmd/go.mod
similarity index 100%
rename from src/cmd/go.mod
rename to src/client/cmd/go.mod
diff --git a/src/cmdLogin/go.mod b/src/client/cmdLogin/go.mod
similarity index 100%
rename from src/cmdLogin/go.mod
rename to src/client/cmdLogin/go.mod
diff --git a/src/cmdLogin/login.go b/src/client/cmdLogin/login.go
similarity index 100%
rename from src/cmdLogin/login.go
rename to src/client/cmdLogin/login.go
diff --git a/src/cmdTemplate/go.mod b/src/client/cmdTemplate/go.mod
similarity index 100%
rename from src/cmdTemplate/go.mod
rename to src/client/cmdTemplate/go.mod
diff --git a/src/cmdTemplate/helper.go b/src/client/cmdTemplate/helper.go
similarity index 100%
rename from src/cmdTemplate/helper.go
rename to src/client/cmdTemplate/helper.go
diff --git a/src/cmdTemplate/template.go b/src/client/cmdTemplate/template.go
similarity index 100%
rename from src/cmdTemplate/template.go
rename to src/client/cmdTemplate/template.go
diff --git a/src/cmdTemplate/templateCreate.go b/src/client/cmdTemplate/templateCreate.go
similarity index 100%
rename from src/cmdTemplate/templateCreate.go
rename to src/client/cmdTemplate/templateCreate.go
diff --git a/src/cmdTemplate/templateCreate.go.new b/src/client/cmdTemplate/templateCreate.go.new
similarity index 100%
rename from src/cmdTemplate/templateCreate.go.new
rename to src/client/cmdTemplate/templateCreate.go.new
diff --git a/src/cmdTemplate/templateDel.go b/src/client/cmdTemplate/templateDel.go
similarity index 100%
rename from src/cmdTemplate/templateDel.go
rename to src/client/cmdTemplate/templateDel.go
diff --git a/src/cmdTemplate/templateEdit.go b/src/client/cmdTemplate/templateEdit.go
similarity index 100%
rename from src/cmdTemplate/templateEdit.go
rename to src/client/cmdTemplate/templateEdit.go
diff --git a/src/cmdTemplate/templateExportDisk.go b/src/client/cmdTemplate/templateExportDisk.go
similarity index 100%
rename from src/cmdTemplate/templateExportDisk.go
rename to src/client/cmdTemplate/templateExportDisk.go
diff --git a/src/cmdTemplate/templateList.go b/src/client/cmdTemplate/templateList.go
similarity index 100%
rename from src/cmdTemplate/templateList.go
rename to src/client/cmdTemplate/templateList.go
diff --git a/src/cmdToken/go.mod b/src/client/cmdToken/go.mod
similarity index 100%
rename from src/cmdToken/go.mod
rename to src/client/cmdToken/go.mod
diff --git a/src/cmdToken/tokenRefresh.go b/src/client/cmdToken/tokenRefresh.go
similarity index 100%
rename from src/cmdToken/tokenRefresh.go
rename to src/client/cmdToken/tokenRefresh.go
diff --git a/src/cmdUser/go.mod b/src/client/cmdUser/go.mod
similarity index 100%
rename from src/cmdUser/go.mod
rename to src/client/cmdUser/go.mod
diff --git a/src/cmdUser/go.sum b/src/client/cmdUser/go.sum
similarity index 100%
rename from src/cmdUser/go.sum
rename to src/client/cmdUser/go.sum
diff --git a/src/cmdUser/helper.go b/src/client/cmdUser/helper.go
similarity index 100%
rename from src/cmdUser/helper.go
rename to src/client/cmdUser/helper.go
diff --git a/src/cmdUser/user.go b/src/client/cmdUser/user.go
similarity index 100%
rename from src/cmdUser/user.go
rename to src/client/cmdUser/user.go
diff --git a/src/cmdUser/userAdd.go b/src/client/cmdUser/userAdd.go
similarity index 100%
rename from src/cmdUser/userAdd.go
rename to src/client/cmdUser/userAdd.go
diff --git a/src/cmdUser/userDel.go b/src/client/cmdUser/userDel.go
similarity index 100%
rename from src/cmdUser/userDel.go
rename to src/client/cmdUser/userDel.go
diff --git a/src/cmdUser/userList.go b/src/client/cmdUser/userList.go
similarity index 100%
rename from src/cmdUser/userList.go
rename to src/client/cmdUser/userList.go
diff --git a/src/cmdUser/userSetCaps.go b/src/client/cmdUser/userSetCaps.go
similarity index 100%
rename from src/cmdUser/userSetCaps.go
rename to src/client/cmdUser/userSetCaps.go
diff --git a/src/cmdUser/userUpdatePwd.go b/src/client/cmdUser/userUpdatePwd.go
similarity index 100%
rename from src/cmdUser/userUpdatePwd.go
rename to src/client/cmdUser/userUpdatePwd.go
diff --git a/src/cmdUser/userWhoami.go b/src/client/cmdUser/userWhoami.go
similarity index 100%
rename from src/cmdUser/userWhoami.go
rename to src/client/cmdUser/userWhoami.go
diff --git a/src/cmdVM/go.mod b/src/client/cmdVM/go.mod
similarity index 100%
rename from src/cmdVM/go.mod
rename to src/client/cmdVM/go.mod
diff --git a/src/cmdVM/go.sum b/src/client/cmdVM/go.sum
similarity index 100%
rename from src/cmdVM/go.sum
rename to src/client/cmdVM/go.sum
diff --git a/src/cmdVM/helper.go b/src/client/cmdVM/helper.go
similarity index 100%
rename from src/cmdVM/helper.go
rename to src/client/cmdVM/helper.go
diff --git a/src/cmdVM/resources/cmuntb.ttf b/src/client/cmdVM/resources/cmuntb.ttf
similarity index 100%
rename from src/cmdVM/resources/cmuntb.ttf
rename to src/client/cmdVM/resources/cmuntb.ttf
diff --git a/src/cmdVM/vm.go b/src/client/cmdVM/vm.go
similarity index 100%
rename from src/cmdVM/vm.go
rename to src/client/cmdVM/vm.go
diff --git a/src/cmdVM/vmAddAccess.go b/src/client/cmdVM/vmAddAccess.go
similarity index 100%
rename from src/cmdVM/vmAddAccess.go
rename to src/client/cmdVM/vmAddAccess.go
diff --git a/src/cmdVM/vmAttach.go b/src/client/cmdVM/vmAttach.go
similarity index 100%
rename from src/cmdVM/vmAttach.go
rename to src/client/cmdVM/vmAttach.go
diff --git a/src/cmdVM/vmCreate.go b/src/client/cmdVM/vmCreate.go
similarity index 100%
rename from src/cmdVM/vmCreate.go
rename to src/client/cmdVM/vmCreate.go
diff --git a/src/cmdVM/vmCred2csv.go b/src/client/cmdVM/vmCred2csv.go
similarity index 100%
rename from src/cmdVM/vmCred2csv.go
rename to src/client/cmdVM/vmCred2csv.go
diff --git a/src/cmdVM/vmCred2pdf.go b/src/client/cmdVM/vmCred2pdf.go
similarity index 100%
rename from src/cmdVM/vmCred2pdf.go
rename to src/client/cmdVM/vmCred2pdf.go
diff --git a/src/cmdVM/vmDel.go b/src/client/cmdVM/vmDel.go
similarity index 100%
rename from src/cmdVM/vmDel.go
rename to src/client/cmdVM/vmDel.go
diff --git a/src/cmdVM/vmDelAccess.go b/src/client/cmdVM/vmDelAccess.go
similarity index 100%
rename from src/cmdVM/vmDelAccess.go
rename to src/client/cmdVM/vmDelAccess.go
diff --git a/src/cmdVM/vmEdit.go b/src/client/cmdVM/vmEdit.go
similarity index 100%
rename from src/cmdVM/vmEdit.go
rename to src/client/cmdVM/vmEdit.go
diff --git a/src/cmdVM/vmExportDir.go b/src/client/cmdVM/vmExportDir.go
similarity index 100%
rename from src/cmdVM/vmExportDir.go
rename to src/client/cmdVM/vmExportDir.go
diff --git a/src/cmdVM/vmImportDir.go b/src/client/cmdVM/vmImportDir.go
similarity index 100%
rename from src/cmdVM/vmImportDir.go
rename to src/client/cmdVM/vmImportDir.go
diff --git a/src/cmdVM/vmList.go b/src/client/cmdVM/vmList.go
similarity index 100%
rename from src/cmdVM/vmList.go
rename to src/client/cmdVM/vmList.go
diff --git a/src/cmdVM/vmReboot.go b/src/client/cmdVM/vmReboot.go
similarity index 100%
rename from src/cmdVM/vmReboot.go
rename to src/client/cmdVM/vmReboot.go
diff --git a/src/cmdVM/vmShutdown.go b/src/client/cmdVM/vmShutdown.go
similarity index 100%
rename from src/cmdVM/vmShutdown.go
rename to src/client/cmdVM/vmShutdown.go
diff --git a/src/cmdVM/vmStart.go b/src/client/cmdVM/vmStart.go
similarity index 100%
rename from src/cmdVM/vmStart.go
rename to src/client/cmdVM/vmStart.go
diff --git a/src/cmdVM/vmStop.go b/src/client/cmdVM/vmStop.go
similarity index 100%
rename from src/cmdVM/vmStop.go
rename to src/client/cmdVM/vmStop.go
diff --git a/src/cmdVersion/go.mod b/src/client/cmdVersion/go.mod
similarity index 100%
rename from src/cmdVersion/go.mod
rename to src/client/cmdVersion/go.mod
diff --git a/src/cmdVersion/version.go b/src/client/cmdVersion/version.go
similarity index 100%
rename from src/cmdVersion/version.go
rename to src/client/cmdVersion/version.go
diff --git a/src/defaults/Defaults.go b/src/client/defaults/Defaults.go
similarity index 100%
rename from src/defaults/Defaults.go
rename to src/client/defaults/Defaults.go
diff --git a/src/defaults/go.mod b/src/client/defaults/go.mod
similarity index 100%
rename from src/defaults/go.mod
rename to src/client/defaults/go.mod
diff --git a/src/defaults/resources/nexus_pub_cert.pem b/src/client/defaults/resources/nexus_pub_cert.pem
similarity index 100%
rename from src/defaults/resources/nexus_pub_cert.pem
rename to src/client/defaults/resources/nexus_pub_cert.pem
diff --git a/src/exec/RemoteViewer.go b/src/client/exec/RemoteViewer.go
similarity index 100%
rename from src/exec/RemoteViewer.go
rename to src/client/exec/RemoteViewer.go
diff --git a/src/exec/go.mod b/src/client/exec/go.mod
similarity index 100%
rename from src/exec/go.mod
rename to src/client/exec/go.mod
diff --git a/src/globals/Globals.go b/src/client/globals/Globals.go
similarity index 100%
rename from src/globals/Globals.go
rename to src/client/globals/Globals.go
diff --git a/src/globals/go.mod b/src/client/globals/go.mod
similarity index 100%
rename from src/globals/go.mod
rename to src/client/globals/go.mod
diff --git a/src/nexus-cli/Makefile b/src/client/nexus-cli/Makefile
similarity index 100%
rename from src/nexus-cli/Makefile
rename to src/client/nexus-cli/Makefile
diff --git a/src/nexus-cli/go.mod b/src/client/nexus-cli/go.mod
similarity index 100%
rename from src/nexus-cli/go.mod
rename to src/client/nexus-cli/go.mod
diff --git a/src/nexus-cli/go.sum b/src/client/nexus-cli/go.sum
similarity index 100%
rename from src/nexus-cli/go.sum
rename to src/client/nexus-cli/go.sum
diff --git a/src/nexus-cli/nexus-cli.go b/src/client/nexus-cli/nexus-cli.go
similarity index 100%
rename from src/nexus-cli/nexus-cli.go
rename to src/client/nexus-cli/nexus-cli.go
diff --git a/src/nexus-cli/validate b/src/client/nexus-cli/validate
similarity index 100%
rename from src/nexus-cli/validate
rename to src/client/nexus-cli/validate
diff --git a/src/nexus-cli/validation_data/exam/Exam.md b/src/client/nexus-cli/validation_data/exam/Exam.md
similarity index 100%
rename from src/nexus-cli/validation_data/exam/Exam.md
rename to src/client/nexus-cli/validation_data/exam/Exam.md
diff --git a/src/nexus-cli/validation_data/exam/Makefile b/src/client/nexus-cli/validation_data/exam/Makefile
similarity index 100%
rename from src/nexus-cli/validation_data/exam/Makefile
rename to src/client/nexus-cli/validation_data/exam/Makefile
diff --git a/src/nexus-cli/validation_data/exam/ressources/part1/Makefile b/src/client/nexus-cli/validation_data/exam/ressources/part1/Makefile
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part1/Makefile
rename to src/client/nexus-cli/validation_data/exam/ressources/part1/Makefile
diff --git a/src/nexus-cli/validation_data/exam/ressources/part1/avg.c b/src/client/nexus-cli/validation_data/exam/ressources/part1/avg.c
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part1/avg.c
rename to src/client/nexus-cli/validation_data/exam/ressources/part1/avg.c
diff --git a/src/nexus-cli/validation_data/exam/ressources/part1/max.c b/src/client/nexus-cli/validation_data/exam/ressources/part1/max.c
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part1/max.c
rename to src/client/nexus-cli/validation_data/exam/ressources/part1/max.c
diff --git a/src/nexus-cli/validation_data/exam/ressources/part1/min.c b/src/client/nexus-cli/validation_data/exam/ressources/part1/min.c
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part1/min.c
rename to src/client/nexus-cli/validation_data/exam/ressources/part1/min.c
diff --git a/src/nexus-cli/validation_data/exam/ressources/part1/stat.h b/src/client/nexus-cli/validation_data/exam/ressources/part1/stat.h
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part1/stat.h
rename to src/client/nexus-cli/validation_data/exam/ressources/part1/stat.h
diff --git a/src/nexus-cli/validation_data/exam/ressources/part2/Makefile b/src/client/nexus-cli/validation_data/exam/ressources/part2/Makefile
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part2/Makefile
rename to src/client/nexus-cli/validation_data/exam/ressources/part2/Makefile
diff --git a/src/nexus-cli/validation_data/exam/ressources/part2/testat.c b/src/client/nexus-cli/validation_data/exam/ressources/part2/testat.c
similarity index 100%
rename from src/nexus-cli/validation_data/exam/ressources/part2/testat.c
rename to src/client/nexus-cli/validation_data/exam/ressources/part2/testat.c
diff --git a/src/nexus-cli/validation_data/students.csv b/src/client/nexus-cli/validation_data/students.csv
similarity index 100%
rename from src/nexus-cli/validation_data/students.csv
rename to src/client/nexus-cli/validation_data/students.csv
diff --git a/src/nexus-exam/go.mod b/src/client/nexus-exam/go.mod
similarity index 100%
rename from src/nexus-exam/go.mod
rename to src/client/nexus-exam/go.mod
diff --git a/src/nexus-exam/go.sum b/src/client/nexus-exam/go.sum
similarity index 100%
rename from src/nexus-exam/go.sum
rename to src/client/nexus-exam/go.sum
diff --git a/src/nexus-exam/nexus-exam.go b/src/client/nexus-exam/nexus-exam.go
similarity index 100%
rename from src/nexus-exam/nexus-exam.go
rename to src/client/nexus-exam/nexus-exam.go
diff --git a/src/nexus-gui/go.mod b/src/client/nexus-gui/go.mod
similarity index 100%
rename from src/nexus-gui/go.mod
rename to src/client/nexus-gui/go.mod
diff --git a/src/nexus-gui/go.sum b/src/client/nexus-gui/go.sum
similarity index 100%
rename from src/nexus-gui/go.sum
rename to src/client/nexus-gui/go.sum
diff --git a/src/nexus-gui/nexus-gui.go b/src/client/nexus-gui/nexus-gui.go
similarity index 100%
rename from src/nexus-gui/nexus-gui.go
rename to src/client/nexus-gui/nexus-gui.go
diff --git a/src/nexush/Makefile b/src/client/nexush/Makefile
similarity index 100%
rename from src/nexush/Makefile
rename to src/client/nexush/Makefile
diff --git a/src/nexush/go.mod b/src/client/nexush/go.mod
similarity index 100%
rename from src/nexush/go.mod
rename to src/client/nexush/go.mod
diff --git a/src/nexush/go.sum b/src/client/nexush/go.sum
similarity index 100%
rename from src/nexush/go.sum
rename to src/client/nexush/go.sum
diff --git a/src/nexush/ls.go b/src/client/nexush/ls.go
similarity index 100%
rename from src/nexush/ls.go
rename to src/client/nexush/ls.go
diff --git a/src/nexush/nexush.go b/src/client/nexush/nexush.go
similarity index 100%
rename from src/nexush/nexush.go
rename to src/client/nexush/nexush.go
diff --git a/src/utils/csv.go b/src/client/utils/csv.go
similarity index 100%
rename from src/utils/csv.go
rename to src/client/utils/csv.go
diff --git a/src/utils/go.mod b/src/client/utils/go.mod
similarity index 100%
rename from src/utils/go.mod
rename to src/client/utils/go.mod
diff --git a/src/utils/utils.go b/src/client/utils/utils.go
similarity index 100%
rename from src/utils/utils.go
rename to src/client/utils/utils.go
diff --git a/src/version/go.mod b/src/client/version/go.mod
similarity index 100%
rename from src/version/go.mod
rename to src/client/version/go.mod
diff --git a/src/version/version.go b/src/client/version/version.go
similarity index 100%
rename from src/version/version.go
rename to src/client/version/version.go