Change GUI and GUI2 to be apps rather than core features

Change-Id: I862e5bdbccc29fd78716159e168e7a14bc5053e1
diff --git a/tools/build/bazel/modules.bzl b/tools/build/bazel/modules.bzl
index 8d13e45..2820cb9 100644
--- a/tools/build/bazel/modules.bzl
+++ b/tools/build/bazel/modules.bzl
@@ -71,8 +71,6 @@
     "//providers/general/device:onos-providers-general-device",
     "//providers/p4runtime/packet:onos-providers-p4runtime-packet",
     "//web/api:onos-rest",
-    "//web/gui2:onos-gui2",
-    "//web/gui:onos-gui",
     "//core/protobuf/models/proto:onos-core-protobuf-models-proto",
     "//core/protobuf/models:onos-core-protobuf-models",
 ]
@@ -248,7 +246,8 @@
     "//apps/imr:onos-apps-imr-oar",
     "//apps/nodemetrics:onos-apps-nodemetrics-oar",
     "//apps/inbandtelemetry:onos-apps-inbandtelemetry-oar",
-    # "//web/gui2:onos-web-gui2-oar",
+    "//web/gui2:onos-web-gui2-oar",
+    "//web/gui:onos-web-gui-oar",
     "//apps/workflow:onos-apps-workflow-oar",
     "//apps/workflow/ofoverlay:onos-apps-workflow-ofoverlay-oar",
 ]
@@ -308,8 +307,6 @@
     "//tools/package/features:onos-core",
     "//tools/package/features:onos-cli",
     "//tools/package/features:onos-rest",
-    "//tools/package/features:onos-gui",
-    "//tools/package/features:onos-gui2",
     # "//tools/package/features:onos-security",
 ]