diff --git a/testmacros/demomacros/Core/DemoAutofill.json b/test/demomacros/core/DemoAutofill.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoAutofill.json
rename to test/demomacros/core/DemoAutofill.json
diff --git a/testmacros/demomacros/Core/DemoCanvas.json b/test/demomacros/core/DemoCanvas.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoCanvas.json
rename to test/demomacros/core/DemoCanvas.json
diff --git a/testmacros/demomacros/Core/DemoComputerVision.json b/test/demomacros/core/DemoComputerVision.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoComputerVision.json
rename to test/demomacros/core/DemoComputerVision.json
diff --git a/testmacros/demomacros/Core/DemoCsvReadWithLoop.json b/test/demomacros/core/DemoCsvReadWithLoop.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoCsvReadWithLoop.json
rename to test/demomacros/core/DemoCsvReadWithLoop.json
diff --git a/testmacros/demomacros/Core/DemoCsvReadWithWhile.json b/test/demomacros/core/DemoCsvReadWithWhile.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoCsvReadWithWhile.json
rename to test/demomacros/core/DemoCsvReadWithWhile.json
diff --git a/testmacros/demomacros/Core/DemoCsvSave.json b/test/demomacros/core/DemoCsvSave.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoCsvSave.json
rename to test/demomacros/core/DemoCsvSave.json
diff --git a/testmacros/demomacros/Core/DemoDialogboxes.json b/test/demomacros/core/DemoDialogboxes.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoDialogboxes.json
rename to test/demomacros/core/DemoDialogboxes.json
diff --git a/testmacros/demomacros/Core/DemoDownload.json b/test/demomacros/core/DemoDownload.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoDownload.json
rename to test/demomacros/core/DemoDownload.json
diff --git a/testmacros/demomacros/Core/DemoDragDrop.json b/test/demomacros/core/DemoDragDrop.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoDragDrop.json
rename to test/demomacros/core/DemoDragDrop.json
diff --git a/testmacros/demomacros/Core/DemoExecuteScript.json b/test/demomacros/core/DemoExecuteScript.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoExecuteScript.json
rename to test/demomacros/core/DemoExecuteScript.json
diff --git a/testmacros/demomacros/Core/DemoExtract.json b/test/demomacros/core/DemoExtract.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoExtract.json
rename to test/demomacros/core/DemoExtract.json
diff --git a/testmacros/demomacros/Core/DemoFrames.json b/test/demomacros/core/DemoFrames.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoFrames.json
rename to test/demomacros/core/DemoFrames.json
diff --git a/testmacros/demomacros/Core/DemoIfElse.json b/test/demomacros/core/DemoIfElse.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoIfElse.json
rename to test/demomacros/core/DemoIfElse.json
diff --git a/testmacros/demomacros/Core/DemoIframe.json b/test/demomacros/core/DemoIframe.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoIframe.json
rename to test/demomacros/core/DemoIframe.json
diff --git a/testmacros/demomacros/Core/DemoImplicitWaiting.json b/test/demomacros/core/DemoImplicitWaiting.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoImplicitWaiting.json
rename to test/demomacros/core/DemoImplicitWaiting.json
diff --git a/testmacros/demomacros/Core/DemoTabs.json b/test/demomacros/core/DemoTabs.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoTabs.json
rename to test/demomacros/core/DemoTabs.json
diff --git a/testmacros/demomacros/Core/DemoTakeScreenshots.json b/test/demomacros/core/DemoTakeScreenshots.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoTakeScreenshots.json
rename to test/demomacros/core/DemoTakeScreenshots.json
diff --git a/testmacros/demomacros/Core/DemoVisualUITest.json b/test/demomacros/core/DemoVisualUITest.json
similarity index 100%
rename from testmacros/demomacros/Core/DemoVisualUITest.json
rename to test/demomacros/core/DemoVisualUITest.json
diff --git a/testmacros/demomacros/Core/Sub/Sub_DemoCsvRead_FillForm.json b/test/demomacros/core/sub/Sub_DemoCsvRead_FillForm.json
similarity index 100%
rename from testmacros/demomacros/Core/Sub/Sub_DemoCsvRead_FillForm.json
rename to test/demomacros/core/sub/Sub_DemoCsvRead_FillForm.json
diff --git a/testmacros/demomacros/XModules/DemoPDFTest_with_OCR.json b/test/demomacros/xmodules/DemoPDFTest_with_OCR.json
similarity index 100%
rename from testmacros/demomacros/XModules/DemoPDFTest_with_OCR.json
rename to test/demomacros/xmodules/DemoPDFTest_with_OCR.json
diff --git a/testmacros/demomacros/XModules/DemoXClick.json b/test/demomacros/xmodules/DemoXClick.json
similarity index 100%
rename from testmacros/demomacros/XModules/DemoXClick.json
rename to test/demomacros/xmodules/DemoXClick.json
diff --git a/testmacros/demomacros/XModules/DemoXRun.json b/test/demomacros/xmodules/DemoXRun.json
similarity index 100%
rename from testmacros/demomacros/XModules/DemoXRun.json
rename to test/demomacros/xmodules/DemoXRun.json
diff --git a/testmacros/demomacros/XModules/DemoXType.json b/test/demomacros/xmodules/DemoXType.json
similarity index 100%
rename from testmacros/demomacros/XModules/DemoXType.json
rename to test/demomacros/xmodules/DemoXType.json
diff --git a/testmacros/demomacros/XModules_Desktop/DemoXDesktopAutomation.json b/test/demomacros/xmodules_desktop/DemoXDesktopAutomation.json
similarity index 100%
rename from testmacros/demomacros/XModules_Desktop/DemoXDesktopAutomation.json
rename to test/demomacros/xmodules_desktop/DemoXDesktopAutomation.json
diff --git a/testmacros/demomacros/XModules_Desktop/DemoXDesktopAutomation_OCR.json b/test/demomacros/xmodules_desktop/DemoXDesktopAutomation_OCR.json
similarity index 100%
rename from testmacros/demomacros/XModules_Desktop/DemoXDesktopAutomation_OCR.json
rename to test/demomacros/xmodules_desktop/DemoXDesktopAutomation_OCR.json
diff --git a/testmacros/demomacros/XModules_Desktop/Sub/Sub_XDesktopAutomation_Area.json b/test/demomacros/xmodules_desktop/sub/Sub_XDesktopAutomation_Area.json
similarity index 100%
rename from testmacros/demomacros/XModules_Desktop/Sub/Sub_XDesktopAutomation_Area.json
rename to test/demomacros/xmodules_desktop/sub/Sub_XDesktopAutomation_Area.json
diff --git a/testmacros/html-import-tests/DemoAutofill.html b/test/html-import-tests/DemoAutofill.html
similarity index 100%
rename from testmacros/html-import-tests/DemoAutofill.html
rename to test/html-import-tests/DemoAutofill.html
diff --git a/testmacros/html-import-tests/DemoCsvRead.html b/test/html-import-tests/DemoCsvRead.html
similarity index 100%
rename from testmacros/html-import-tests/DemoCsvRead.html
rename to test/html-import-tests/DemoCsvRead.html
diff --git a/testmacros/html-import-tests/DemoCsvRead.json b/test/html-import-tests/DemoCsvRead.json
similarity index 100%
rename from testmacros/html-import-tests/DemoCsvRead.json
rename to test/html-import-tests/DemoCsvRead.json
diff --git a/testmacros/html-import-tests/DemoCsvSave.html b/test/html-import-tests/DemoCsvSave.html
similarity index 100%
rename from testmacros/html-import-tests/DemoCsvSave.html
rename to test/html-import-tests/DemoCsvSave.html
diff --git a/testmacros/html-import-tests/DemoDialogboxes.html b/test/html-import-tests/DemoDialogboxes.html
similarity index 100%
rename from testmacros/html-import-tests/DemoDialogboxes.html
rename to test/html-import-tests/DemoDialogboxes.html
diff --git a/testmacros/html-import-tests/DemoDragDrop.html b/test/html-import-tests/DemoDragDrop.html
similarity index 100%
rename from testmacros/html-import-tests/DemoDragDrop.html
rename to test/html-import-tests/DemoDragDrop.html
diff --git a/testmacros/html-import-tests/DemoExtract.html b/test/html-import-tests/DemoExtract.html
similarity index 100%
rename from testmacros/html-import-tests/DemoExtract.html
rename to test/html-import-tests/DemoExtract.html
diff --git a/testmacros/html-import-tests/DemoFrames.html b/test/html-import-tests/DemoFrames.html
similarity index 100%
rename from testmacros/html-import-tests/DemoFrames.html
rename to test/html-import-tests/DemoFrames.html
diff --git a/testmacros/html-import-tests/DemoGotoIf.html b/test/html-import-tests/DemoGotoIf.html
similarity index 100%
rename from testmacros/html-import-tests/DemoGotoIf.html
rename to test/html-import-tests/DemoGotoIf.html
diff --git a/testmacros/html-import-tests/DemoGotoIf.json b/test/html-import-tests/DemoGotoIf.json
similarity index 100%
rename from testmacros/html-import-tests/DemoGotoIf.json
rename to test/html-import-tests/DemoGotoIf.json
diff --git a/testmacros/html-import-tests/DemoIframe.html b/test/html-import-tests/DemoIframe.html
similarity index 100%
rename from testmacros/html-import-tests/DemoIframe.html
rename to test/html-import-tests/DemoIframe.html
diff --git a/testmacros/html-import-tests/DemoImplicitWaiting.html b/test/html-import-tests/DemoImplicitWaiting.html
similarity index 100%
rename from testmacros/html-import-tests/DemoImplicitWaiting.html
rename to test/html-import-tests/DemoImplicitWaiting.html
diff --git a/testmacros/html-import-tests/DemoPOS.html b/test/html-import-tests/DemoPOS.html
similarity index 100%
rename from testmacros/html-import-tests/DemoPOS.html
rename to test/html-import-tests/DemoPOS.html
diff --git a/testmacros/html-import-tests/DemoStoreEval.html b/test/html-import-tests/DemoStoreEval.html
similarity index 100%
rename from testmacros/html-import-tests/DemoStoreEval.html
rename to test/html-import-tests/DemoStoreEval.html
diff --git a/testmacros/html-import-tests/DemoTabs.html b/test/html-import-tests/DemoTabs.html
similarity index 100%
rename from testmacros/html-import-tests/DemoTabs.html
rename to test/html-import-tests/DemoTabs.html
diff --git a/testmacros/html-import-tests/DemoTimeout.html b/test/html-import-tests/DemoTimeout.html
similarity index 100%
rename from testmacros/html-import-tests/DemoTimeout.html
rename to test/html-import-tests/DemoTimeout.html
diff --git a/testmacros/html-import-tests/a9t9.comformfilling.html b/test/html-import-tests/a9t9.comformfilling.html
similarity index 100%
rename from testmacros/html-import-tests/a9t9.comformfilling.html
rename to test/html-import-tests/a9t9.comformfilling.html
diff --git a/testmacros/html-import-tests/calculator.html b/test/html-import-tests/calculator.html
similarity index 100%
rename from testmacros/html-import-tests/calculator.html
rename to test/html-import-tests/calculator.html
diff --git a/testmacros/html-import-tests/dialog-alert.html b/test/html-import-tests/dialog-alert.html
similarity index 100%
rename from testmacros/html-import-tests/dialog-alert.html
rename to test/html-import-tests/dialog-alert.html
diff --git a/testmacros/html-import-tests/dialog-confirm.html b/test/html-import-tests/dialog-confirm.html
similarity index 100%
rename from testmacros/html-import-tests/dialog-confirm.html
rename to test/html-import-tests/dialog-confirm.html
diff --git a/testmacros/html-import-tests/dialog-prompt.html b/test/html-import-tests/dialog-prompt.html
similarity index 100%
rename from testmacros/html-import-tests/dialog-prompt.html
rename to test/html-import-tests/dialog-prompt.html
diff --git a/testmacros/html-import-tests/frametest-w3org.html b/test/html-import-tests/frametest-w3org.html
similarity index 100%
rename from testmacros/html-import-tests/frametest-w3org.html
rename to test/html-import-tests/frametest-w3org.html
diff --git a/testmacros/html-import-tests/iframetest-play-youtube.html b/test/html-import-tests/iframetest-play-youtube.html
similarity index 100%
rename from testmacros/html-import-tests/iframetest-play-youtube.html
rename to test/html-import-tests/iframetest-play-youtube.html
diff --git a/testmacros/html-import-tests/iframetest-wufoo.html b/test/html-import-tests/iframetest-wufoo.html
similarity index 100%
rename from testmacros/html-import-tests/iframetest-wufoo.html
rename to test/html-import-tests/iframetest-wufoo.html
diff --git a/testmacros/html-import-tests/ocr.space-chinese-ocr.html b/test/html-import-tests/ocr.space-chinese-ocr.html
similarity index 100%
rename from testmacros/html-import-tests/ocr.space-chinese-ocr.html
rename to test/html-import-tests/ocr.space-chinese-ocr.html
diff --git a/testmacros/html-import-tests/ocrspacetest.html b/test/html-import-tests/ocrspacetest.html
similarity index 100%
rename from testmacros/html-import-tests/ocrspacetest.html
rename to test/html-import-tests/ocrspacetest.html
diff --git a/testmacros/html-import-tests/salesforcelogin.html b/test/html-import-tests/salesforcelogin.html
similarity index 100%
rename from testmacros/html-import-tests/salesforcelogin.html
rename to test/html-import-tests/salesforcelogin.html
diff --git a/testmacros/html-import-tests/storetestrayban.html b/test/html-import-tests/storetestrayban.html
similarity index 100%
rename from testmacros/html-import-tests/storetestrayban.html
rename to test/html-import-tests/storetestrayban.html
diff --git a/testmacros/html-import-tests/wikipediatesla.html b/test/html-import-tests/wikipediatesla.html
similarity index 100%
rename from testmacros/html-import-tests/wikipediatesla.html
rename to test/html-import-tests/wikipediatesla.html
diff --git a/testmacros/html-import-tests/yahootaiwan.html b/test/html-import-tests/yahootaiwan.html
similarity index 100%
rename from testmacros/html-import-tests/yahootaiwan.html
rename to test/html-import-tests/yahootaiwan.html
diff --git a/testmacros/images/canvas_3dots_verify_dpi_96.png b/test/images/canvas_3dots_verify_dpi_96.png
similarity index 100%
rename from testmacros/images/canvas_3dots_verify_dpi_96.png
rename to test/images/canvas_3dots_verify_dpi_96.png
diff --git a/testmacros/images/canvas_hydepark_dpi_96.png b/test/images/canvas_hydepark_dpi_96.png
similarity index 100%
rename from testmacros/images/canvas_hydepark_dpi_96.png
rename to test/images/canvas_hydepark_dpi_96.png
diff --git a/testmacros/images/canvas_hydepark_extract_dpi_96_relative.png b/test/images/canvas_hydepark_extract_dpi_96_relative.png
similarity index 100%
rename from testmacros/images/canvas_hydepark_extract_dpi_96_relative.png
rename to test/images/canvas_hydepark_extract_dpi_96_relative.png
diff --git a/testmacros/images/canvas_hydepark_verify_dpi_96.png b/test/images/canvas_hydepark_verify_dpi_96.png
similarity index 100%
rename from testmacros/images/canvas_hydepark_verify_dpi_96.png
rename to test/images/canvas_hydepark_verify_dpi_96.png
diff --git a/testmacros/images/canvas_wyoming_dpi_96.png b/test/images/canvas_wyoming_dpi_96.png
similarity index 100%
rename from testmacros/images/canvas_wyoming_dpi_96.png
rename to test/images/canvas_wyoming_dpi_96.png
diff --git a/testmacros/images/canvas_wyoming_verify_dpi_96.png b/test/images/canvas_wyoming_verify_dpi_96.png
similarity index 100%
rename from testmacros/images/canvas_wyoming_verify_dpi_96.png
rename to test/images/canvas_wyoming_verify_dpi_96.png
diff --git a/testmacros/images/democv_checkoverlay.png b/test/images/democv_checkoverlay.png
similarity index 100%
rename from testmacros/images/democv_checkoverlay.png
rename to test/images/democv_checkoverlay.png
diff --git a/testmacros/images/democv_ocrdone.png b/test/images/democv_ocrdone.png
similarity index 100%
rename from testmacros/images/democv_ocrdone.png
rename to test/images/democv_ocrdone.png
diff --git a/testmacros/images/democv_share.png b/test/images/democv_share.png
similarity index 100%
rename from testmacros/images/democv_share.png
rename to test/images/democv_share.png
diff --git a/testmacros/images/democv_startocr.png b/test/images/democv_startocr.png
similarity index 100%
rename from testmacros/images/democv_startocr.png
rename to test/images/democv_startocr.png
diff --git a/testmacros/images/desktop_area_bottomright_dpi_96.png b/test/images/desktop_area_bottomright_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_area_bottomright_dpi_96.png
rename to test/images/desktop_area_bottomright_dpi_96.png
diff --git a/testmacros/images/desktop_area_topleft_dpi_96.png b/test/images/desktop_area_topleft_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_area_topleft_dpi_96.png
rename to test/images/desktop_area_topleft_dpi_96.png
diff --git a/testmacros/images/desktop_checktab_dpi_96.png b/test/images/desktop_checktab_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_checktab_dpi_96.png
rename to test/images/desktop_checktab_dpi_96.png
diff --git a/testmacros/images/desktop_clearbutton_dpi_96.png b/test/images/desktop_clearbutton_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_clearbutton_dpi_96.png
rename to test/images/desktop_clearbutton_dpi_96.png
diff --git a/testmacros/images/desktop_logstab_grey_dpi_96.png b/test/images/desktop_logstab_grey_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_logstab_grey_dpi_96.png
rename to test/images/desktop_logstab_grey_dpi_96.png
diff --git a/testmacros/images/desktop_logstab_white_dpi_96.png b/test/images/desktop_logstab_white_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_logstab_white_dpi_96.png
rename to test/images/desktop_logstab_white_dpi_96.png
diff --git a/testmacros/images/desktop_scrtab_dpi_96.png b/test/images/desktop_scrtab_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_scrtab_dpi_96.png
rename to test/images/desktop_scrtab_dpi_96.png
diff --git a/testmacros/images/desktop_searcharea_dpi_96_relative.png b/test/images/desktop_searcharea_dpi_96_relative.png
similarity index 100%
rename from testmacros/images/desktop_searcharea_dpi_96_relative.png
rename to test/images/desktop_searcharea_dpi_96_relative.png
diff --git a/testmacros/images/desktop_vartab_dpi_96.png b/test/images/desktop_vartab_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_vartab_dpi_96.png
rename to test/images/desktop_vartab_dpi_96.png
diff --git a/testmacros/images/desktop_vitab_dpi_96.png b/test/images/desktop_vitab_dpi_96.png
similarity index 100%
rename from testmacros/images/desktop_vitab_dpi_96.png
rename to test/images/desktop_vitab_dpi_96.png
diff --git a/testmacros/images/draw_aa_dpi_96_relative.png b/test/images/draw_aa_dpi_96_relative.png
similarity index 100%
rename from testmacros/images/draw_aa_dpi_96_relative.png
rename to test/images/draw_aa_dpi_96_relative.png
diff --git a/testmacros/images/draw_box_dpi_96.png b/test/images/draw_box_dpi_96.png
similarity index 100%
rename from testmacros/images/draw_box_dpi_96.png
rename to test/images/draw_box_dpi_96.png
diff --git a/testmacros/images/draw_square_dpi_96.png b/test/images/draw_square_dpi_96.png
similarity index 100%
rename from testmacros/images/draw_square_dpi_96.png
rename to test/images/draw_square_dpi_96.png
diff --git a/testmacros/images/getquotenumber_dpi_96_relative.png b/test/images/getquotenumber_dpi_96_relative.png
similarity index 100%
rename from testmacros/images/getquotenumber_dpi_96_relative.png
rename to test/images/getquotenumber_dpi_96_relative.png
diff --git a/testmacros/images/pdftest_salesquote.png b/test/images/pdftest_salesquote.png
similarity index 100%
rename from testmacros/images/pdftest_salesquote.png
rename to test/images/pdftest_salesquote.png
diff --git a/testmacros/images/uitest_download_dpi_96.png b/test/images/uitest_download_dpi_96.png
similarity index 100%
rename from testmacros/images/uitest_download_dpi_96.png
rename to test/images/uitest_download_dpi_96.png
diff --git a/testmacros/images/uitest_hamburger_dpi_96.png b/test/images/uitest_hamburger_dpi_96.png
similarity index 100%
rename from testmacros/images/uitest_hamburger_dpi_96.png
rename to test/images/uitest_hamburger_dpi_96.png
diff --git a/testmacros/images/uitest_logo_mobile_dpi_96.png b/test/images/uitest_logo_mobile_dpi_96.png
similarity index 100%
rename from testmacros/images/uitest_logo_mobile_dpi_96.png
rename to test/images/uitest_logo_mobile_dpi_96.png
diff --git a/testmacros/images/uitest_logo_wide_dpi_96.png b/test/images/uitest_logo_wide_dpi_96.png
similarity index 100%
rename from testmacros/images/uitest_logo_wide_dpi_96.png
rename to test/images/uitest_logo_wide_dpi_96.png
diff --git a/testmacros/images/uitest_share_dpi_96.png b/test/images/uitest_share_dpi_96.png
similarity index 100%
rename from testmacros/images/uitest_share_dpi_96.png
rename to test/images/uitest_share_dpi_96.png
diff --git a/testmacros/images/youtube_play_button.png b/test/images/youtube_play_button.png
similarity index 100%
rename from testmacros/images/youtube_play_button.png
rename to test/images/youtube_play_button.png
diff --git a/testmacros/images/youtube_video_content_verify.png b/test/images/youtube_video_content_verify.png
similarity index 100%
rename from testmacros/images/youtube_video_content_verify.png
rename to test/images/youtube_video_content_verify.png
diff --git a/testmacros/testsuites/DemoLoopsInsideTestSuite.json b/test/testsuites/DemoLoopsInsideTestSuite.json
similarity index 100%
rename from testmacros/testsuites/DemoLoopsInsideTestSuite.json
rename to test/testsuites/DemoLoopsInsideTestSuite.json
diff --git a/testmacros/testsuites/DemoTestSuite.json b/test/testsuites/DemoTestSuite.json
similarity index 100%
rename from testmacros/testsuites/DemoTestSuite.json
rename to test/testsuites/DemoTestSuite.json