diff --git a/classes/output/mobile.php b/scripts/templates/behat-plugin/classes/output/mobile.php
similarity index 100%
rename from classes/output/mobile.php
rename to scripts/templates/behat-plugin/classes/output/mobile.php
diff --git a/db/mobile.php b/scripts/templates/behat-plugin/db/mobile.php
similarity index 100%
rename from db/mobile.php
rename to scripts/templates/behat-plugin/db/mobile.php
diff --git a/js/mobile/index.js b/scripts/templates/behat-plugin/js/mobile/index.js
similarity index 100%
rename from js/mobile/index.js
rename to scripts/templates/behat-plugin/js/mobile/index.js
diff --git a/mod/messages/tests/behat/app_basic_usage.feature b/src/addons/messages/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/messages/tests/behat/app_basic_usage.feature
rename to src/addons/messages/tests/behat/basic_usage.feature
diff --git a/mod/messages/tests/behat/navigation.feature b/src/addons/messages/tests/behat/navigation.feature
similarity index 100%
rename from mod/messages/tests/behat/navigation.feature
rename to src/addons/messages/tests/behat/navigation.feature
diff --git a/mod/messages/tests/behat/settings.feature b/src/addons/messages/tests/behat/settings.feature
similarity index 100%
rename from mod/messages/tests/behat/settings.feature
rename to src/addons/messages/tests/behat/settings.feature
diff --git a/mod/assignment/tests/behat/app_basic_usage.feature b/src/addons/mod/assign/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/assignment/tests/behat/app_basic_usage.feature
rename to src/addons/mod/assign/tests/behat/basic_usage.feature
diff --git a/mod/assignment/tests/behat/app_navigation.feature b/src/addons/mod/assign/tests/behat/navigation.feature
similarity index 100%
rename from mod/assignment/tests/behat/app_navigation.feature
rename to src/addons/mod/assign/tests/behat/navigation.feature
diff --git a/mod/chat/tests/behat/app_basic_usage.feature b/src/addons/mod/chat/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/chat/tests/behat/app_basic_usage.feature
rename to src/addons/mod/chat/tests/behat/basic_usage.feature
diff --git a/mod/chat/tests/behat/app_navigation.feature b/src/addons/mod/chat/tests/behat/navigation.feature
similarity index 100%
rename from mod/chat/tests/behat/app_navigation.feature
rename to src/addons/mod/chat/tests/behat/navigation.feature
diff --git a/mod/choice/tests/behat/app_basic_usage.feature b/src/addons/mod/choice/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/choice/tests/behat/app_basic_usage.feature
rename to src/addons/mod/choice/tests/behat/basic_usage.feature
diff --git a/mod/data/tests/behat/app_data_entries.feature b/src/addons/mod/data/tests/behat/data_entries.feature
similarity index 100%
rename from mod/data/tests/behat/app_data_entries.feature
rename to src/addons/mod/data/tests/behat/data_entries.feature
diff --git a/mod/data/tests/behat/app_data_sync.feature b/src/addons/mod/data/tests/behat/data_sync.feature
similarity index 100%
rename from mod/data/tests/behat/app_data_sync.feature
rename to src/addons/mod/data/tests/behat/data_sync.feature
diff --git a/mod/forum/tests/behat/app_basic_usage.feature b/src/addons/mod/forum/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/forum/tests/behat/app_basic_usage.feature
rename to src/addons/mod/forum/tests/behat/basic_usage.feature
diff --git a/mod/forum/tests/behat/app_navigation.feature b/src/addons/mod/forum/tests/behat/navigation.feature
similarity index 100%
rename from mod/forum/tests/behat/app_navigation.feature
rename to src/addons/mod/forum/tests/behat/navigation.feature
diff --git a/mod/glossary/tests/behat/app_basic_usage.feature b/src/addons/mod/glossary/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/glossary/tests/behat/app_basic_usage.feature
rename to src/addons/mod/glossary/tests/behat/basic_usage.feature
diff --git a/mod/glossary/tests/behat/app_navigation.feature b/src/addons/mod/glossary/tests/behat/navigation.feature
similarity index 100%
rename from mod/glossary/tests/behat/app_navigation.feature
rename to src/addons/mod/glossary/tests/behat/navigation.feature
diff --git a/mod/quiz/tests/behat/app_basic_usage.feature b/src/addons/mod/quiz/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/quiz/tests/behat/app_basic_usage.feature
rename to src/addons/mod/quiz/tests/behat/basic_usage.feature
diff --git a/mod/quiz/tests/behat/app_quiz_navigation.feature b/src/addons/mod/quiz/tests/behat/quiz_navigation.feature
similarity index 100%
rename from mod/quiz/tests/behat/app_quiz_navigation.feature
rename to src/addons/mod/quiz/tests/behat/quiz_navigation.feature
diff --git a/mod/survey/tests/behat/app_basic_usage.feature b/src/addons/mod/survey/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/survey/tests/behat/app_basic_usage.feature
rename to src/addons/mod/survey/tests/behat/basic_usage.feature
diff --git a/mod/comments/tests/behat/app_basic_usage.feature b/src/core/features/comments/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/comments/tests/behat/app_basic_usage.feature
rename to src/core/features/comments/tests/behat/basic_usage.feature
diff --git a/mod/course/tests/behat/app_basic_usage.feature b/src/core/features/course/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/course/tests/behat/app_basic_usage.feature
rename to src/core/features/course/tests/behat/basic_usage.feature
diff --git a/mod/course/tests/behat/app_course_completion.feature b/src/core/features/course/tests/behat/course_completion.feature
similarity index 100%
rename from mod/course/tests/behat/app_course_completion.feature
rename to src/core/features/course/tests/behat/course_completion.feature
diff --git a/mod/course/tests/behat/app_courselist.feature b/src/core/features/course/tests/behat/courselist.feature
similarity index 100%
rename from mod/course/tests/behat/app_courselist.feature
rename to src/core/features/course/tests/behat/courselist.feature
diff --git a/mod/courses/tests/behat/app_basic_usage.feature b/src/core/features/courses/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/courses/tests/behat/app_basic_usage.feature
rename to src/core/features/courses/tests/behat/basic_usage.feature
diff --git a/mod/login/tests/behat/app_basic_usage.feature b/src/core/features/login/tests/behat/basic_usage.feature
similarity index 100%
rename from mod/login/tests/behat/app_basic_usage.feature
rename to src/core/features/login/tests/behat/basic_usage.feature
diff --git a/tests/behat/mainmenu.feature b/src/core/features/mainmenu/tests/behat/mainmenu.feature
similarity index 100%
rename from tests/behat/mainmenu.feature
rename to src/core/features/mainmenu/tests/behat/mainmenu.feature
diff --git a/tests/behat/settings_navigation.feature b/src/core/features/settings/tests/behat/settings_navigation.feature
similarity index 100%
rename from tests/behat/settings_navigation.feature
rename to src/core/features/settings/tests/behat/settings_navigation.feature
diff --git a/tests/behat/plugins.feature b/src/core/features/siteplugins/tests/behat/plugins.feature
similarity index 100%
rename from tests/behat/plugins.feature
rename to src/core/features/siteplugins/tests/behat/plugins.feature
diff --git a/tests/behat/usertours.feature b/src/core/features/usertours/tests/behat/usertours.feature
similarity index 100%
rename from tests/behat/usertours.feature
rename to src/core/features/usertours/tests/behat/usertours.feature
diff --git a/tests/behat/navigation_activities.feature b/src/tests/behat/navigation_activities.feature
similarity index 100%
rename from tests/behat/navigation_activities.feature
rename to src/tests/behat/navigation_activities.feature
diff --git a/tests/behat/navigation_deeplinks.feature b/src/tests/behat/navigation_deeplinks.feature
similarity index 100%
rename from tests/behat/navigation_deeplinks.feature
rename to src/tests/behat/navigation_deeplinks.feature
diff --git a/tests/behat/navigation_externallinks.feature b/src/tests/behat/navigation_externallinks.feature
similarity index 100%
rename from tests/behat/navigation_externallinks.feature
rename to src/tests/behat/navigation_externallinks.feature
diff --git a/tests/behat/navigation_gestures.feature b/src/tests/behat/navigation_gestures.feature
similarity index 100%
rename from tests/behat/navigation_gestures.feature
rename to src/tests/behat/navigation_gestures.feature
diff --git a/tests/behat/navigation_splitview.feature b/src/tests/behat/navigation_splitview.feature
similarity index 100%
rename from tests/behat/navigation_splitview.feature
rename to src/tests/behat/navigation_splitview.feature