diff --git a/License b/License
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/License
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/burt-gui-new/.eslintignore b/burt-gui/.eslintignore
similarity index 100%
rename from burt-gui-new/.eslintignore
rename to burt-gui/.eslintignore
diff --git a/burt-gui-new/.gitignore b/burt-gui/.gitignore
similarity index 100%
rename from burt-gui-new/.gitignore
rename to burt-gui/.gitignore
diff --git a/burt-gui-new/.gitlab-ci.yml b/burt-gui/.gitlab-ci.yml
similarity index 100%
rename from burt-gui-new/.gitlab-ci.yml
rename to burt-gui/.gitlab-ci.yml
diff --git a/burt-gui-new/.prettierrc b/burt-gui/.prettierrc
similarity index 100%
rename from burt-gui-new/.prettierrc
rename to burt-gui/.prettierrc
diff --git a/burt-gui-new/README.md b/burt-gui/README.md
similarity index 100%
rename from burt-gui-new/README.md
rename to burt-gui/README.md
diff --git a/burt-gui-new/package.json b/burt-gui/package.json
similarity index 100%
rename from burt-gui-new/package.json
rename to burt-gui/package.json
diff --git a/burt-gui-new/public/apple-touch-icon.png b/burt-gui/public/apple-touch-icon.png
similarity index 100%
rename from burt-gui-new/public/apple-touch-icon.png
rename to burt-gui/public/apple-touch-icon.png
diff --git a/burt-gui-new/public/favicon.ico b/burt-gui/public/favicon.ico
similarity index 100%
rename from burt-gui-new/public/favicon.ico
rename to burt-gui/public/favicon.ico
diff --git a/burt-gui-new/public/favicon_package/android-chrome-192x192.png b/burt-gui/public/favicon_package/android-chrome-192x192.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/android-chrome-192x192.png
rename to burt-gui/public/favicon_package/android-chrome-192x192.png
diff --git a/burt-gui-new/public/favicon_package/android-chrome-512x512.png b/burt-gui/public/favicon_package/android-chrome-512x512.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/android-chrome-512x512.png
rename to burt-gui/public/favicon_package/android-chrome-512x512.png
diff --git a/burt-gui-new/public/favicon_package/apple-touch-icon.png b/burt-gui/public/favicon_package/apple-touch-icon.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/apple-touch-icon.png
rename to burt-gui/public/favicon_package/apple-touch-icon.png
diff --git a/burt-gui-new/public/favicon_package/browserconfig.xml b/burt-gui/public/favicon_package/browserconfig.xml
similarity index 100%
rename from burt-gui-new/public/favicon_package/browserconfig.xml
rename to burt-gui/public/favicon_package/browserconfig.xml
diff --git a/burt-gui-new/public/favicon_package/favicon-16x16.png b/burt-gui/public/favicon_package/favicon-16x16.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/favicon-16x16.png
rename to burt-gui/public/favicon_package/favicon-16x16.png
diff --git a/burt-gui-new/public/favicon_package/favicon-32x32.png b/burt-gui/public/favicon_package/favicon-32x32.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/favicon-32x32.png
rename to burt-gui/public/favicon_package/favicon-32x32.png
diff --git a/burt-gui-new/public/favicon_package/favicon.ico b/burt-gui/public/favicon_package/favicon.ico
similarity index 100%
rename from burt-gui-new/public/favicon_package/favicon.ico
rename to burt-gui/public/favicon_package/favicon.ico
diff --git a/burt-gui-new/public/favicon_package/mstile-144x144.png b/burt-gui/public/favicon_package/mstile-144x144.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/mstile-144x144.png
rename to burt-gui/public/favicon_package/mstile-144x144.png
diff --git a/burt-gui-new/public/favicon_package/mstile-150x150.png b/burt-gui/public/favicon_package/mstile-150x150.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/mstile-150x150.png
rename to burt-gui/public/favicon_package/mstile-150x150.png
diff --git a/burt-gui-new/public/favicon_package/mstile-310x150.png b/burt-gui/public/favicon_package/mstile-310x150.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/mstile-310x150.png
rename to burt-gui/public/favicon_package/mstile-310x150.png
diff --git a/burt-gui-new/public/favicon_package/mstile-310x310.png b/burt-gui/public/favicon_package/mstile-310x310.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/mstile-310x310.png
rename to burt-gui/public/favicon_package/mstile-310x310.png
diff --git a/burt-gui-new/public/favicon_package/mstile-70x70.png b/burt-gui/public/favicon_package/mstile-70x70.png
similarity index 100%
rename from burt-gui-new/public/favicon_package/mstile-70x70.png
rename to burt-gui/public/favicon_package/mstile-70x70.png
diff --git a/burt-gui-new/public/favicon_package/safari-pinned-tab.svg b/burt-gui/public/favicon_package/safari-pinned-tab.svg
similarity index 100%
rename from burt-gui-new/public/favicon_package/safari-pinned-tab.svg
rename to burt-gui/public/favicon_package/safari-pinned-tab.svg
diff --git a/burt-gui-new/public/favicon_package/site.webmanifest b/burt-gui/public/favicon_package/site.webmanifest
similarity index 100%
rename from burt-gui-new/public/favicon_package/site.webmanifest
rename to burt-gui/public/favicon_package/site.webmanifest
diff --git a/burt-gui-new/public/index.html b/burt-gui/public/index.html
similarity index 100%
rename from burt-gui-new/public/index.html
rename to burt-gui/public/index.html
diff --git a/burt-gui-new/public/logo192.png b/burt-gui/public/logo192.png
similarity index 100%
rename from burt-gui-new/public/logo192.png
rename to burt-gui/public/logo192.png
diff --git a/burt-gui-new/public/logo512.png b/burt-gui/public/logo512.png
similarity index 100%
rename from burt-gui-new/public/logo512.png
rename to burt-gui/public/logo512.png
diff --git a/burt-gui-new/public/manifest.json b/burt-gui/public/manifest.json
similarity index 100%
rename from burt-gui-new/public/manifest.json
rename to burt-gui/public/manifest.json
diff --git a/burt-gui-new/public/robots.txt b/burt-gui/public/robots.txt
similarity index 100%
rename from burt-gui-new/public/robots.txt
rename to burt-gui/public/robots.txt
diff --git a/burt-gui-new/run_app.bat b/burt-gui/run_app.bat
similarity index 100%
rename from burt-gui-new/run_app.bat
rename to burt-gui/run_app.bat
diff --git a/burt-gui-new/run_app.sh b/burt-gui/run_app.sh
old mode 100755
new mode 100644
similarity index 100%
rename from burt-gui-new/run_app.sh
rename to burt-gui/run_app.sh
diff --git a/burt-gui-new/skybot.gif b/burt-gui/skybot.gif
similarity index 100%
rename from burt-gui-new/skybot.gif
rename to burt-gui/skybot.gif
diff --git a/burt-gui-new/src/App.css b/burt-gui/src/App.css
similarity index 100%
rename from burt-gui-new/src/App.css
rename to burt-gui/src/App.css
diff --git a/burt-gui-new/src/App.js b/burt-gui/src/App.js
similarity index 100%
rename from burt-gui-new/src/App.js
rename to burt-gui/src/App.js
diff --git a/burt-gui-new/src/App.test.js b/burt-gui/src/App.test.js
similarity index 100%
rename from burt-gui-new/src/App.test.js
rename to burt-gui/src/App.test.js
diff --git a/burt-gui-new/src/assets/icons/chatbot-1.svg b/burt-gui/src/assets/icons/chatbot-1.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/chatbot-1.svg
rename to burt-gui/src/assets/icons/chatbot-1.svg
diff --git a/burt-gui-new/src/assets/icons/chatbot-2.svg b/burt-gui/src/assets/icons/chatbot-2.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/chatbot-2.svg
rename to burt-gui/src/assets/icons/chatbot-2.svg
diff --git a/burt-gui-new/src/assets/icons/chatbot-3.png b/burt-gui/src/assets/icons/chatbot-3.png
similarity index 100%
rename from burt-gui-new/src/assets/icons/chatbot-3.png
rename to burt-gui/src/assets/icons/chatbot-3.png
diff --git a/burt-gui-new/src/assets/icons/chatbot.svg b/burt-gui/src/assets/icons/chatbot.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/chatbot.svg
rename to burt-gui/src/assets/icons/chatbot.svg
diff --git a/burt-gui-new/src/assets/icons/choice.svg b/burt-gui/src/assets/icons/choice.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/choice.svg
rename to burt-gui/src/assets/icons/choice.svg
diff --git a/burt-gui-new/src/assets/icons/comment-alt-lines.svg b/burt-gui/src/assets/icons/comment-alt-lines.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/comment-alt-lines.svg
rename to burt-gui/src/assets/icons/comment-alt-lines.svg
diff --git a/burt-gui-new/src/assets/icons/delete_step_icon.svg b/burt-gui/src/assets/icons/delete_step_icon.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/delete_step_icon.svg
rename to burt-gui/src/assets/icons/delete_step_icon.svg
diff --git a/burt-gui-new/src/assets/icons/help.svg b/burt-gui/src/assets/icons/help.svg
similarity index 98%
rename from burt-gui-new/src/assets/icons/help.svg
rename to burt-gui/src/assets/icons/help.svg
index 723c56018..e51dab3fa 100644
--- a/burt-gui-new/src/assets/icons/help.svg
+++ b/burt-gui/src/assets/icons/help.svg
@@ -1,116 +1,116 @@
-
-
-
+
+
+
diff --git a/burt-gui-new/src/assets/icons/hints.svg b/burt-gui/src/assets/icons/hints.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/hints.svg
rename to burt-gui/src/assets/icons/hints.svg
diff --git a/burt-gui-new/src/assets/icons/list.svg b/burt-gui/src/assets/icons/list.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/list.svg
rename to burt-gui/src/assets/icons/list.svg
diff --git a/burt-gui-new/src/assets/icons/paper-plane.svg b/burt-gui/src/assets/icons/paper-plane.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/paper-plane.svg
rename to burt-gui/src/assets/icons/paper-plane.svg
diff --git a/burt-gui-new/src/assets/icons/phone.svg b/burt-gui/src/assets/icons/phone.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/phone.svg
rename to burt-gui/src/assets/icons/phone.svg
diff --git a/burt-gui-new/src/assets/icons/plane-alt.svg b/burt-gui/src/assets/icons/plane-alt.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/plane-alt.svg
rename to burt-gui/src/assets/icons/plane-alt.svg
diff --git a/burt-gui-new/src/assets/icons/show_screenshot_step_icon1.svg b/burt-gui/src/assets/icons/show_screenshot_step_icon1.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/show_screenshot_step_icon1.svg
rename to burt-gui/src/assets/icons/show_screenshot_step_icon1.svg
diff --git a/burt-gui-new/src/assets/icons/show_screenshot_step_icon2.svg b/burt-gui/src/assets/icons/show_screenshot_step_icon2.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/show_screenshot_step_icon2.svg
rename to burt-gui/src/assets/icons/show_screenshot_step_icon2.svg
diff --git a/burt-gui-new/src/assets/icons/user-alt.svg b/burt-gui/src/assets/icons/user-alt.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/user-alt.svg
rename to burt-gui/src/assets/icons/user-alt.svg
diff --git a/burt-gui-new/src/assets/icons/user-icon-old.svg b/burt-gui/src/assets/icons/user-icon-old.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/user-icon-old.svg
rename to burt-gui/src/assets/icons/user-icon-old.svg
diff --git a/burt-gui-new/src/assets/icons/user-icon.svg b/burt-gui/src/assets/icons/user-icon.svg
similarity index 100%
rename from burt-gui-new/src/assets/icons/user-icon.svg
rename to burt-gui/src/assets/icons/user-icon.svg
diff --git a/burt-gui-new/src/assets/images/check.png b/burt-gui/src/assets/images/check.png
similarity index 100%
rename from burt-gui-new/src/assets/images/check.png
rename to burt-gui/src/assets/images/check.png
diff --git a/burt-gui-new/src/components/Chat/Chat.css b/burt-gui/src/components/Chat/Chat.css
similarity index 100%
rename from burt-gui-new/src/components/Chat/Chat.css
rename to burt-gui/src/components/Chat/Chat.css
diff --git a/burt-gui-new/src/components/Chat/Chat.jsx b/burt-gui/src/components/Chat/Chat.jsx
similarity index 100%
rename from burt-gui-new/src/components/Chat/Chat.jsx
rename to burt-gui/src/components/Chat/Chat.jsx
diff --git a/burt-gui-new/src/components/Chat/chatUtils.js b/burt-gui/src/components/Chat/chatUtils.js
similarity index 100%
rename from burt-gui-new/src/components/Chat/chatUtils.js
rename to burt-gui/src/components/Chat/chatUtils.js
diff --git a/burt-gui-new/src/components/Chatbot/Chatbot.css b/burt-gui/src/components/Chatbot/Chatbot.css
similarity index 100%
rename from burt-gui-new/src/components/Chatbot/Chatbot.css
rename to burt-gui/src/components/Chatbot/Chatbot.css
diff --git a/burt-gui-new/src/components/Chatbot/Chatbot.jsx b/burt-gui/src/components/Chatbot/Chatbot.jsx
similarity index 100%
rename from burt-gui-new/src/components/Chatbot/Chatbot.jsx
rename to burt-gui/src/components/Chatbot/Chatbot.jsx
diff --git a/burt-gui-new/src/components/Chatbot/utils.js b/burt-gui/src/components/Chatbot/utils.js
similarity index 100%
rename from burt-gui-new/src/components/Chatbot/utils.js
rename to burt-gui/src/components/Chatbot/utils.js
diff --git a/burt-gui-new/src/components/ChatbotError/ChatbotError.css b/burt-gui/src/components/ChatbotError/ChatbotError.css
similarity index 100%
rename from burt-gui-new/src/components/ChatbotError/ChatbotError.css
rename to burt-gui/src/components/ChatbotError/ChatbotError.css
diff --git a/burt-gui-new/src/components/ChatbotError/ChatbotError.jsx b/burt-gui/src/components/ChatbotError/ChatbotError.jsx
similarity index 100%
rename from burt-gui-new/src/components/ChatbotError/ChatbotError.jsx
rename to burt-gui/src/components/ChatbotError/ChatbotError.jsx
diff --git a/burt-gui-new/src/components/ChatbotMessage/ChatBotMessageAvatar/ChatbotMessageAvatar.jsx b/burt-gui/src/components/ChatbotMessage/ChatBotMessageAvatar/ChatbotMessageAvatar.jsx
similarity index 100%
rename from burt-gui-new/src/components/ChatbotMessage/ChatBotMessageAvatar/ChatbotMessageAvatar.jsx
rename to burt-gui/src/components/ChatbotMessage/ChatBotMessageAvatar/ChatbotMessageAvatar.jsx
diff --git a/burt-gui-new/src/components/ChatbotMessage/ChatbotMessage.css b/burt-gui/src/components/ChatbotMessage/ChatbotMessage.css
similarity index 100%
rename from burt-gui-new/src/components/ChatbotMessage/ChatbotMessage.css
rename to burt-gui/src/components/ChatbotMessage/ChatbotMessage.css
diff --git a/burt-gui-new/src/components/ChatbotMessage/ChatbotMessage.jsx b/burt-gui/src/components/ChatbotMessage/ChatbotMessage.jsx
similarity index 100%
rename from burt-gui-new/src/components/ChatbotMessage/ChatbotMessage.jsx
rename to burt-gui/src/components/ChatbotMessage/ChatbotMessage.jsx
diff --git a/burt-gui-new/src/components/ChatbotMessageWithWidget/ChatbotMessageWithWidget.jsx b/burt-gui/src/components/ChatbotMessageWithWidget/ChatbotMessageWithWidget.jsx
similarity index 100%
rename from burt-gui-new/src/components/ChatbotMessageWithWidget/ChatbotMessageWithWidget.jsx
rename to burt-gui/src/components/ChatbotMessageWithWidget/ChatbotMessageWithWidget.jsx
diff --git a/burt-gui-new/src/components/ImagePicker/Image.js b/burt-gui/src/components/ImagePicker/Image.js
similarity index 100%
rename from burt-gui-new/src/components/ImagePicker/Image.js
rename to burt-gui/src/components/ImagePicker/Image.js
diff --git a/burt-gui-new/src/components/ImagePicker/ImagePicker.js b/burt-gui/src/components/ImagePicker/ImagePicker.js
similarity index 100%
rename from burt-gui-new/src/components/ImagePicker/ImagePicker.js
rename to burt-gui/src/components/ImagePicker/ImagePicker.js
diff --git a/burt-gui-new/src/components/ImagePicker/index.scss b/burt-gui/src/components/ImagePicker/index.scss
similarity index 100%
rename from burt-gui-new/src/components/ImagePicker/index.scss
rename to burt-gui/src/components/ImagePicker/index.scss
diff --git a/burt-gui-new/src/components/LinkList/LinkList.css b/burt-gui/src/components/LinkList/LinkList.css
similarity index 100%
rename from burt-gui-new/src/components/LinkList/LinkList.css
rename to burt-gui/src/components/LinkList/LinkList.css
diff --git a/burt-gui-new/src/components/LinkList/LinkList.jsx b/burt-gui/src/components/LinkList/LinkList.jsx
similarity index 100%
rename from burt-gui-new/src/components/LinkList/LinkList.jsx
rename to burt-gui/src/components/LinkList/LinkList.jsx
diff --git a/burt-gui-new/src/components/Loader/Loader.jsx b/burt-gui/src/components/Loader/Loader.jsx
similarity index 100%
rename from burt-gui-new/src/components/Loader/Loader.jsx
rename to burt-gui/src/components/Loader/Loader.jsx
diff --git a/burt-gui-new/src/components/ReportGenerator/ReportGenerator.css b/burt-gui/src/components/ReportGenerator/ReportGenerator.css
similarity index 100%
rename from burt-gui-new/src/components/ReportGenerator/ReportGenerator.css
rename to burt-gui/src/components/ReportGenerator/ReportGenerator.css
diff --git a/burt-gui-new/src/components/ReportGenerator/ReportGenerator.jsx b/burt-gui/src/components/ReportGenerator/ReportGenerator.jsx
similarity index 100%
rename from burt-gui-new/src/components/ReportGenerator/ReportGenerator.jsx
rename to burt-gui/src/components/ReportGenerator/ReportGenerator.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/AppSelector.css b/burt-gui/src/components/ScreenOptions/AppSelector.css
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/AppSelector.css
rename to burt-gui/src/components/ScreenOptions/AppSelector.css
diff --git a/burt-gui-new/src/components/ScreenOptions/AppSelector.jsx b/burt-gui/src/components/ScreenOptions/AppSelector.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/AppSelector.jsx
rename to burt-gui/src/components/ScreenOptions/AppSelector.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/EBScreen.css b/burt-gui/src/components/ScreenOptions/EBScreen.css
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/EBScreen.css
rename to burt-gui/src/components/ScreenOptions/EBScreen.css
diff --git a/burt-gui-new/src/components/ScreenOptions/OBScreenSelector.jsx b/burt-gui/src/components/ScreenOptions/OBScreenSelector.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/OBScreenSelector.jsx
rename to burt-gui/src/components/ScreenOptions/OBScreenSelector.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/OneScreenYesNoButtons.jsx b/burt-gui/src/components/ScreenOptions/OneScreenYesNoButtons.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/OneScreenYesNoButtons.jsx
rename to burt-gui/src/components/ScreenOptions/OneScreenYesNoButtons.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/S2RPredictionConfirmation.jsx b/burt-gui/src/components/ScreenOptions/S2RPredictionConfirmation.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/S2RPredictionConfirmation.jsx
rename to burt-gui/src/components/ScreenOptions/S2RPredictionConfirmation.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/S2RScreenSelector.jsx b/burt-gui/src/components/ScreenOptions/S2RScreenSelector.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/S2RScreenSelector.jsx
rename to burt-gui/src/components/ScreenOptions/S2RScreenSelector.jsx
diff --git a/burt-gui-new/src/components/ScreenOptions/YesNoButtons.jsx b/burt-gui/src/components/ScreenOptions/YesNoButtons.jsx
similarity index 100%
rename from burt-gui-new/src/components/ScreenOptions/YesNoButtons.jsx
rename to burt-gui/src/components/ScreenOptions/YesNoButtons.jsx
diff --git a/burt-gui-new/src/components/StepsPanel/StepComponent.jsx b/burt-gui/src/components/StepsPanel/StepComponent.jsx
similarity index 100%
rename from burt-gui-new/src/components/StepsPanel/StepComponent.jsx
rename to burt-gui/src/components/StepsPanel/StepComponent.jsx
diff --git a/burt-gui-new/src/components/StepsPanel/StepsPanel.css b/burt-gui/src/components/StepsPanel/StepsPanel.css
similarity index 100%
rename from burt-gui-new/src/components/StepsPanel/StepsPanel.css
rename to burt-gui/src/components/StepsPanel/StepsPanel.css
diff --git a/burt-gui-new/src/components/StepsPanel/StepsPanel.jsx b/burt-gui/src/components/StepsPanel/StepsPanel.jsx
similarity index 100%
rename from burt-gui-new/src/components/StepsPanel/StepsPanel.jsx
rename to burt-gui/src/components/StepsPanel/StepsPanel.jsx
diff --git a/burt-gui-new/src/components/TipsOptions/TipsOptions.css b/burt-gui/src/components/TipsOptions/TipsOptions.css
similarity index 100%
rename from burt-gui-new/src/components/TipsOptions/TipsOptions.css
rename to burt-gui/src/components/TipsOptions/TipsOptions.css
diff --git a/burt-gui-new/src/components/TipsOptions/TipsOptionsPanel.jsx b/burt-gui/src/components/TipsOptions/TipsOptionsPanel.jsx
similarity index 100%
rename from burt-gui-new/src/components/TipsOptions/TipsOptionsPanel.jsx
rename to burt-gui/src/components/TipsOptions/TipsOptionsPanel.jsx
diff --git a/burt-gui-new/src/components/UserChatMessage/UserChatMessage.css b/burt-gui/src/components/UserChatMessage/UserChatMessage.css
similarity index 100%
rename from burt-gui-new/src/components/UserChatMessage/UserChatMessage.css
rename to burt-gui/src/components/UserChatMessage/UserChatMessage.css
diff --git a/burt-gui-new/src/components/UserChatMessage/UserChatMessage.jsx b/burt-gui/src/components/UserChatMessage/UserChatMessage.jsx
similarity index 100%
rename from burt-gui-new/src/components/UserChatMessage/UserChatMessage.jsx
rename to burt-gui/src/components/UserChatMessage/UserChatMessage.jsx
diff --git a/burt-gui-new/src/components/WidgetRegistry/WidgetRegistry.js b/burt-gui/src/components/WidgetRegistry/WidgetRegistry.js
similarity index 100%
rename from burt-gui-new/src/components/WidgetRegistry/WidgetRegistry.js
rename to burt-gui/src/components/WidgetRegistry/WidgetRegistry.js
diff --git a/burt-gui-new/src/config.css b/burt-gui/src/config.css
similarity index 100%
rename from burt-gui-new/src/config.css
rename to burt-gui/src/config.css
diff --git a/burt-gui-new/src/config.js b/burt-gui/src/config.js
similarity index 100%
rename from burt-gui-new/src/config.js
rename to burt-gui/src/config.js
diff --git a/burt-gui-new/src/index.css b/burt-gui/src/index.css
similarity index 100%
rename from burt-gui-new/src/index.css
rename to burt-gui/src/index.css
diff --git a/burt-gui-new/src/index.js b/burt-gui/src/index.js
similarity index 100%
rename from burt-gui-new/src/index.js
rename to burt-gui/src/index.js
diff --git a/burt-gui-new/src/logic/ActionProvider.js b/burt-gui/src/logic/ActionProvider.js
similarity index 100%
rename from burt-gui-new/src/logic/ActionProvider.js
rename to burt-gui/src/logic/ActionProvider.js
diff --git a/burt-gui-new/src/logic/ApiClient.js b/burt-gui/src/logic/ApiClient.js
similarity index 100%
rename from burt-gui-new/src/logic/ApiClient.js
rename to burt-gui/src/logic/ApiClient.js
diff --git a/burt-gui-new/src/logic/MessageParser.js b/burt-gui/src/logic/MessageParser.js
similarity index 100%
rename from burt-gui-new/src/logic/MessageParser.js
rename to burt-gui/src/logic/MessageParser.js
diff --git a/burt-gui-new/src/logic/ServerResponseProcessor.js b/burt-gui/src/logic/ServerResponseProcessor.js
similarity index 100%
rename from burt-gui-new/src/logic/ServerResponseProcessor.js
rename to burt-gui/src/logic/ServerResponseProcessor.js
diff --git a/burt-gui-new/src/logic/SessionManager.js b/burt-gui/src/logic/SessionManager.js
similarity index 100%
rename from burt-gui-new/src/logic/SessionManager.js
rename to burt-gui/src/logic/SessionManager.js
diff --git a/burt-gui-new/src/logic/UpdateStepsHistory.js b/burt-gui/src/logic/UpdateStepsHistory.js
similarity index 100%
rename from burt-gui-new/src/logic/UpdateStepsHistory.js
rename to burt-gui/src/logic/UpdateStepsHistory.js
diff --git a/burt-gui-new/src/logo.svg b/burt-gui/src/logo.svg
similarity index 100%
rename from burt-gui-new/src/logo.svg
rename to burt-gui/src/logo.svg
diff --git a/burt-gui-new/src/reportWebVitals.js b/burt-gui/src/reportWebVitals.js
similarity index 100%
rename from burt-gui-new/src/reportWebVitals.js
rename to burt-gui/src/reportWebVitals.js
diff --git a/burt-gui-new/src/setupTests.js b/burt-gui/src/setupTests.js
similarity index 100%
rename from burt-gui-new/src/setupTests.js
rename to burt-gui/src/setupTests.js
diff --git a/burt-gui-new/webpack.config.js b/burt-gui/webpack.config.js
similarity index 100%
rename from burt-gui-new/webpack.config.js
rename to burt-gui/webpack.config.js
diff --git a/burt-gui-new/yarn.lock b/burt-gui/yarn.lock
similarity index 100%
rename from burt-gui-new/yarn.lock
rename to burt-gui/yarn.lock
diff --git a/burt-gui-new/yarn.lock.bk b/burt-gui/yarn.lock.bk
similarity index 100%
rename from burt-gui-new/yarn.lock.bk
rename to burt-gui/yarn.lock.bk
diff --git a/burt-server/src/main/java/sealab/burt/server/ConversationController.java b/burt-server/src/main/java/sealab/burt/server/ConversationController.java
index c2edad522..1584d4633 100644
--- a/burt-server/src/main/java/sealab/burt/server/ConversationController.java
+++ b/burt-server/src/main/java/sealab/burt/server/ConversationController.java
@@ -6,6 +6,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import sealab.burt.server.actions.ActionName;
import sealab.burt.server.actions.ChatBotAction;
import sealab.burt.server.actions.others.GenerateBugReportAction;
@@ -32,7 +33,6 @@
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
-
import static sealab.burt.server.StateVariable.*;
import static sealab.burt.server.actions.ActionName.*;
import static sealab.burt.server.msgparsing.Intent.CONFIRM_END_CONVERSATION;
@@ -40,7 +40,7 @@
import static sealab.burt.server.msgparsing.Intent.OB_DESCRIPTION;
import static sealab.burt.server.msgparsing.Intent.*;
-@SpringBootApplication
+@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
@RestController
public
@Slf4j