diff --git a/.gitmodules b/.gitmodules
index 98f7d4d7..eb06ee48 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "llama.cpp"]
-	path = llmodel/llama.cpp
+	path = gpt4all-chat/llmodel/llama.cpp
 	url = https://github.com/manyoso/llama.cpp.git
diff --git a/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to gpt4all-chat/CMakeLists.txt
diff --git a/LICENSE b/gpt4all-chat/LICENSE
similarity index 100%
rename from LICENSE
rename to gpt4all-chat/LICENSE
diff --git a/README.md b/gpt4all-chat/README.md
similarity index 100%
rename from README.md
rename to gpt4all-chat/README.md
diff --git a/build_and_run.md b/gpt4all-chat/build_and_run.md
similarity index 100%
rename from build_and_run.md
rename to gpt4all-chat/build_and_run.md
diff --git a/chat.cpp b/gpt4all-chat/chat.cpp
similarity index 100%
rename from chat.cpp
rename to gpt4all-chat/chat.cpp
diff --git a/chat.h b/gpt4all-chat/chat.h
similarity index 100%
rename from chat.h
rename to gpt4all-chat/chat.h
diff --git a/chatlistmodel.cpp b/gpt4all-chat/chatlistmodel.cpp
similarity index 100%
rename from chatlistmodel.cpp
rename to gpt4all-chat/chatlistmodel.cpp
diff --git a/chatlistmodel.h b/gpt4all-chat/chatlistmodel.h
similarity index 100%
rename from chatlistmodel.h
rename to gpt4all-chat/chatlistmodel.h
diff --git a/chatllm.cpp b/gpt4all-chat/chatllm.cpp
similarity index 100%
rename from chatllm.cpp
rename to gpt4all-chat/chatllm.cpp
diff --git a/chatllm.h b/gpt4all-chat/chatllm.h
similarity index 100%
rename from chatllm.h
rename to gpt4all-chat/chatllm.h
diff --git a/chatmodel.h b/gpt4all-chat/chatmodel.h
similarity index 100%
rename from chatmodel.h
rename to gpt4all-chat/chatmodel.h
diff --git a/cmake/config.h.in b/gpt4all-chat/cmake/config.h.in
similarity index 100%
rename from cmake/config.h.in
rename to gpt4all-chat/cmake/config.h.in
diff --git a/cmake/deploy-qt-linux.cmake.in b/gpt4all-chat/cmake/deploy-qt-linux.cmake.in
similarity index 100%
rename from cmake/deploy-qt-linux.cmake.in
rename to gpt4all-chat/cmake/deploy-qt-linux.cmake.in
diff --git a/cmake/deploy-qt-mac.cmake.in b/gpt4all-chat/cmake/deploy-qt-mac.cmake.in
similarity index 100%
rename from cmake/deploy-qt-mac.cmake.in
rename to gpt4all-chat/cmake/deploy-qt-mac.cmake.in
diff --git a/cmake/deploy-qt-windows.cmake.in b/gpt4all-chat/cmake/deploy-qt-windows.cmake.in
similarity index 100%
rename from cmake/deploy-qt-windows.cmake.in
rename to gpt4all-chat/cmake/deploy-qt-windows.cmake.in
diff --git a/cmake/installerscript.qs b/gpt4all-chat/cmake/installerscript.qs
similarity index 100%
rename from cmake/installerscript.qs
rename to gpt4all-chat/cmake/installerscript.qs
diff --git a/cmake/sign_dmg.py b/gpt4all-chat/cmake/sign_dmg.py
similarity index 100%
rename from cmake/sign_dmg.py
rename to gpt4all-chat/cmake/sign_dmg.py
diff --git a/download.cpp b/gpt4all-chat/download.cpp
similarity index 100%
rename from download.cpp
rename to gpt4all-chat/download.cpp
diff --git a/download.h b/gpt4all-chat/download.h
similarity index 100%
rename from download.h
rename to gpt4all-chat/download.h
diff --git a/icons/copy.svg b/gpt4all-chat/icons/copy.svg
similarity index 100%
rename from icons/copy.svg
rename to gpt4all-chat/icons/copy.svg
diff --git a/icons/edit.svg b/gpt4all-chat/icons/edit.svg
similarity index 100%
rename from icons/edit.svg
rename to gpt4all-chat/icons/edit.svg
diff --git a/icons/favicon.icns b/gpt4all-chat/icons/favicon.icns
similarity index 100%
rename from icons/favicon.icns
rename to gpt4all-chat/icons/favicon.icns
diff --git a/icons/favicon.ico b/gpt4all-chat/icons/favicon.ico
similarity index 100%
rename from icons/favicon.ico
rename to gpt4all-chat/icons/favicon.ico
diff --git a/icons/logo-1024.png b/gpt4all-chat/icons/logo-1024.png
similarity index 100%
rename from icons/logo-1024.png
rename to gpt4all-chat/icons/logo-1024.png
diff --git a/icons/logo-128.png b/gpt4all-chat/icons/logo-128.png
similarity index 100%
rename from icons/logo-128.png
rename to gpt4all-chat/icons/logo-128.png
diff --git a/icons/logo-16.png b/gpt4all-chat/icons/logo-16.png
similarity index 100%
rename from icons/logo-16.png
rename to gpt4all-chat/icons/logo-16.png
diff --git a/icons/logo-256.png b/gpt4all-chat/icons/logo-256.png
similarity index 100%
rename from icons/logo-256.png
rename to gpt4all-chat/icons/logo-256.png
diff --git a/icons/logo-32.png b/gpt4all-chat/icons/logo-32.png
similarity index 100%
rename from icons/logo-32.png
rename to gpt4all-chat/icons/logo-32.png
diff --git a/icons/logo-48.png b/gpt4all-chat/icons/logo-48.png
similarity index 100%
rename from icons/logo-48.png
rename to gpt4all-chat/icons/logo-48.png
diff --git a/icons/logo-512.png b/gpt4all-chat/icons/logo-512.png
similarity index 100%
rename from icons/logo-512.png
rename to gpt4all-chat/icons/logo-512.png
diff --git a/icons/logo-64.png b/gpt4all-chat/icons/logo-64.png
similarity index 100%
rename from icons/logo-64.png
rename to gpt4all-chat/icons/logo-64.png
diff --git a/icons/logo.svg b/gpt4all-chat/icons/logo.svg
similarity index 100%
rename from icons/logo.svg
rename to gpt4all-chat/icons/logo.svg
diff --git a/icons/network.svg b/gpt4all-chat/icons/network.svg
similarity index 100%
rename from icons/network.svg
rename to gpt4all-chat/icons/network.svg
diff --git a/icons/regenerate.svg b/gpt4all-chat/icons/regenerate.svg
similarity index 100%
rename from icons/regenerate.svg
rename to gpt4all-chat/icons/regenerate.svg
diff --git a/icons/send_message.svg b/gpt4all-chat/icons/send_message.svg
similarity index 100%
rename from icons/send_message.svg
rename to gpt4all-chat/icons/send_message.svg
diff --git a/icons/settings.svg b/gpt4all-chat/icons/settings.svg
similarity index 100%
rename from icons/settings.svg
rename to gpt4all-chat/icons/settings.svg
diff --git a/icons/stop_generating.svg b/gpt4all-chat/icons/stop_generating.svg
similarity index 100%
rename from icons/stop_generating.svg
rename to gpt4all-chat/icons/stop_generating.svg
diff --git a/icons/thumbs_down.svg b/gpt4all-chat/icons/thumbs_down.svg
similarity index 100%
rename from icons/thumbs_down.svg
rename to gpt4all-chat/icons/thumbs_down.svg
diff --git a/icons/thumbs_up.svg b/gpt4all-chat/icons/thumbs_up.svg
similarity index 100%
rename from icons/thumbs_up.svg
rename to gpt4all-chat/icons/thumbs_up.svg
diff --git a/icons/trash.svg b/gpt4all-chat/icons/trash.svg
similarity index 100%
rename from icons/trash.svg
rename to gpt4all-chat/icons/trash.svg
diff --git a/llm.cpp b/gpt4all-chat/llm.cpp
similarity index 100%
rename from llm.cpp
rename to gpt4all-chat/llm.cpp
diff --git a/llm.h b/gpt4all-chat/llm.h
similarity index 100%
rename from llm.h
rename to gpt4all-chat/llm.h
diff --git a/llmodel/CMakeLists.txt b/gpt4all-chat/llmodel/CMakeLists.txt
similarity index 100%
rename from llmodel/CMakeLists.txt
rename to gpt4all-chat/llmodel/CMakeLists.txt
diff --git a/llmodel/gptj.cpp b/gpt4all-chat/llmodel/gptj.cpp
similarity index 100%
rename from llmodel/gptj.cpp
rename to gpt4all-chat/llmodel/gptj.cpp
diff --git a/llmodel/gptj.h b/gpt4all-chat/llmodel/gptj.h
similarity index 100%
rename from llmodel/gptj.h
rename to gpt4all-chat/llmodel/gptj.h
diff --git a/llmodel/llama.cpp b/gpt4all-chat/llmodel/llama.cpp
similarity index 100%
rename from llmodel/llama.cpp
rename to gpt4all-chat/llmodel/llama.cpp
diff --git a/llmodel/llamamodel.cpp b/gpt4all-chat/llmodel/llamamodel.cpp
similarity index 100%
rename from llmodel/llamamodel.cpp
rename to gpt4all-chat/llmodel/llamamodel.cpp
diff --git a/llmodel/llamamodel.h b/gpt4all-chat/llmodel/llamamodel.h
similarity index 100%
rename from llmodel/llamamodel.h
rename to gpt4all-chat/llmodel/llamamodel.h
diff --git a/llmodel/llmodel.h b/gpt4all-chat/llmodel/llmodel.h
similarity index 100%
rename from llmodel/llmodel.h
rename to gpt4all-chat/llmodel/llmodel.h
diff --git a/llmodel/llmodel_c.cpp b/gpt4all-chat/llmodel/llmodel_c.cpp
similarity index 100%
rename from llmodel/llmodel_c.cpp
rename to gpt4all-chat/llmodel/llmodel_c.cpp
diff --git a/llmodel/llmodel_c.h b/gpt4all-chat/llmodel/llmodel_c.h
similarity index 100%
rename from llmodel/llmodel_c.h
rename to gpt4all-chat/llmodel/llmodel_c.h
diff --git a/llmodel/mpt.cpp b/gpt4all-chat/llmodel/mpt.cpp
similarity index 100%
rename from llmodel/mpt.cpp
rename to gpt4all-chat/llmodel/mpt.cpp
diff --git a/llmodel/mpt.h b/gpt4all-chat/llmodel/mpt.h
similarity index 100%
rename from llmodel/mpt.h
rename to gpt4all-chat/llmodel/mpt.h
diff --git a/llmodel/scripts/convert_mpt_hf_to_ggml.py b/gpt4all-chat/llmodel/scripts/convert_mpt_hf_to_ggml.py
similarity index 100%
rename from llmodel/scripts/convert_mpt_hf_to_ggml.py
rename to gpt4all-chat/llmodel/scripts/convert_mpt_hf_to_ggml.py
diff --git a/llmodel/utils.cpp b/gpt4all-chat/llmodel/utils.cpp
similarity index 100%
rename from llmodel/utils.cpp
rename to gpt4all-chat/llmodel/utils.cpp
diff --git a/llmodel/utils.h b/gpt4all-chat/llmodel/utils.h
similarity index 100%
rename from llmodel/utils.h
rename to gpt4all-chat/llmodel/utils.h
diff --git a/main.cpp b/gpt4all-chat/main.cpp
similarity index 100%
rename from main.cpp
rename to gpt4all-chat/main.cpp
diff --git a/main.qml b/gpt4all-chat/main.qml
similarity index 100%
rename from main.qml
rename to gpt4all-chat/main.qml
diff --git a/network.cpp b/gpt4all-chat/network.cpp
similarity index 100%
rename from network.cpp
rename to gpt4all-chat/network.cpp
diff --git a/network.h b/gpt4all-chat/network.h
similarity index 100%
rename from network.h
rename to gpt4all-chat/network.h
diff --git a/qml/AboutDialog.qml b/gpt4all-chat/qml/AboutDialog.qml
similarity index 100%
rename from qml/AboutDialog.qml
rename to gpt4all-chat/qml/AboutDialog.qml
diff --git a/qml/ChatDrawer.qml b/gpt4all-chat/qml/ChatDrawer.qml
similarity index 100%
rename from qml/ChatDrawer.qml
rename to gpt4all-chat/qml/ChatDrawer.qml
diff --git a/qml/ModelDownloaderDialog.qml b/gpt4all-chat/qml/ModelDownloaderDialog.qml
similarity index 100%
rename from qml/ModelDownloaderDialog.qml
rename to gpt4all-chat/qml/ModelDownloaderDialog.qml
diff --git a/qml/NetworkDialog.qml b/gpt4all-chat/qml/NetworkDialog.qml
similarity index 100%
rename from qml/NetworkDialog.qml
rename to gpt4all-chat/qml/NetworkDialog.qml
diff --git a/qml/NewVersionDialog.qml b/gpt4all-chat/qml/NewVersionDialog.qml
similarity index 100%
rename from qml/NewVersionDialog.qml
rename to gpt4all-chat/qml/NewVersionDialog.qml
diff --git a/qml/PopupDialog.qml b/gpt4all-chat/qml/PopupDialog.qml
similarity index 100%
rename from qml/PopupDialog.qml
rename to gpt4all-chat/qml/PopupDialog.qml
diff --git a/qml/SettingsDialog.qml b/gpt4all-chat/qml/SettingsDialog.qml
similarity index 100%
rename from qml/SettingsDialog.qml
rename to gpt4all-chat/qml/SettingsDialog.qml
diff --git a/qml/StartupDialog.qml b/gpt4all-chat/qml/StartupDialog.qml
similarity index 100%
rename from qml/StartupDialog.qml
rename to gpt4all-chat/qml/StartupDialog.qml
diff --git a/qml/Theme.qml b/gpt4all-chat/qml/Theme.qml
similarity index 100%
rename from qml/Theme.qml
rename to gpt4all-chat/qml/Theme.qml
diff --git a/qml/ThumbsDownDialog.qml b/gpt4all-chat/qml/ThumbsDownDialog.qml
similarity index 100%
rename from qml/ThumbsDownDialog.qml
rename to gpt4all-chat/qml/ThumbsDownDialog.qml
diff --git a/sysinfo.h b/gpt4all-chat/sysinfo.h
similarity index 100%
rename from sysinfo.h
rename to gpt4all-chat/sysinfo.h
diff --git a/test_hw.cpp b/gpt4all-chat/test_hw.cpp
similarity index 100%
rename from test_hw.cpp
rename to gpt4all-chat/test_hw.cpp