diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 2243e52..0472343 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -6,7 +6,7 @@ data:
     summary: An open, extensible IDE and application platform
     description: >-
         The Eclipse platform is designed for building integrated development
-        environments (IDEs), server-side applications, desktop applications, and
+        environments (IDEs), desktop applications, and
         everything in between.
     license:
         module:
@@ -126,7 +126,7 @@ data:
         rpms:
             eclipse:
                 buildorder: 40
-                ref: stream-eclipse-rhel8-rhel-8.4.0
+                ref: stream-eclipse-rhel8-rhel-8.3.0
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
diff --git a/eclipse.yaml b/eclipse.yaml
deleted file mode 100644
index 2523387..0000000
--- a/eclipse.yaml
+++ /dev/null
@@ -1,322 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-    name: eclipse
-    stream: rhel8
-    summary: An open, extensible IDE and application platform
-    description: >-
-        The Eclipse platform is designed for building integrated development
-        environments (IDEs), server-side applications, desktop applications, and
-        everything in between.
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-              tycho: [rhel8]
-              eclipse: [rhel8]
-              platform: [el8.4.0]
-          requires:
-              platform: [el8]
-    profiles:
-        java:
-            rpms:
-                - eclipse-equinox-osgi
-                - eclipse-jdt
-                - eclipse-pde
-                - eclipse-platform
-                - eclipse-swt
-    api:
-        rpms:
-            - eclipse-ecf-core
-            - eclipse-ecf-runtime
-            - eclipse-emf-core
-            - eclipse-emf-runtime
-            - eclipse-emf-xsd
-            - eclipse-equinox-osgi
-            - eclipse-jdt
-            - eclipse-p2-discovery
-            - eclipse-pde
-            - eclipse-platform
-            - eclipse-swt
-    filter:
-        rpms:
-            - apache-commons-compress-javadoc
-            - apache-commons-jxpath-javadoc
-            - apache-sshd-javadoc
-            - apiguardian-javadoc
-            - args4j-javadoc
-            - args4j-parent
-            - args4j-tools
-            - batik
-            - batik-demo
-            - batik-javadoc
-            - batik-rasterizer
-            - batik-slideshow
-            - batik-squiggle
-            - batik-svgpp
-            - batik-ttf2svg
-            - bouncycastle-javadoc
-            - eclipse-ecf-sdk
-            - eclipse-emf-sdk
-            - ed25519-java-javadoc
-            - felix-gogo-command-javadoc
-            - felix-gogo-runtime-javadoc
-            - felix-gogo-shell-javadoc
-            - felix-scr-javadoc
-            - glassfish-annotation-api-javadoc
-            - glassfish-el-javadoc
-            - glassfish-jsp-api-javadoc
-            - glassfish-jsp-javadoc
-            - glassfish-servlet-api-javadoc
-            - google-gson-javadoc
-            - hamcrest-demo
-            - hamcrest-javadoc
-            - icu4j-charset
-            - icu4j-javadoc
-            - icu4j-localespi
-            - javaewah-javadoc
-            - jetty
-            - jetty-client
-            - jetty-jaas
-            - jetty-javadoc
-            - jetty-jmx
-            - jetty-webapp
-            - jetty-xml
-            - jsch-javadoc
-            - junit5-guide
-            - junit5-javadoc
-            - junit-javadoc
-            - junit-manual
-            - jzlib-demo
-            - jzlib-javadoc
-            - lucene-backward-codecs
-            - lucene-classification
-            - lucene-codecs
-            - lucene-grouping
-            - lucene-highlighter
-            - lucene-javadoc
-            - lucene-join
-            - lucene-memory
-            - lucene-misc
-            - lucene-monitor
-            - lucene-suggest
-            - objectweb-asm-javadoc
-            - opentest4j-javadoc
-            - univocity-parsers-javadoc
-            - xml-commons-apis-javadoc
-            - xmlgraphics-commons-javadoc
-            - xml-commons-apis-manual
-            - xz-java-javadoc
-    buildopts:
-        rpms:
-            macros: |
-                %app_name_prefix Red Hat Eclipse
-                %_with_jp_minimal 1
-                %_without_contrib_tools 1
-                %_without_javahl 1
-                %_without_spring 1
-                %_without_tests 1
-                %_without_reflections 1
-                %_without_okcurl 1
-                %_without_snappy 1
-                %_without_hsqldb 1
-                %_without_junit5 1
-    components:
-        rpms:
-            eclipse:
-                buildorder: 40
-                ref: 0f5e1ffc70d60692e259ff7d500fc732c137a83b
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-            eclipse-ecf:
-                buildorder: 30
-                ref: b5ba940e5064fdc0a0fa8ce0f709a2cddde63ba2
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse.
-            eclipse-emf:
-                buildorder: 20
-                ref: 1e4997e6daca041331c245544cd8af709fb36709
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse, eclipse-ecf.
-            apache-commons-compress:
-                buildorder: 20
-                ref: 8531602e1909b9926c70153c9741f78b9417256b
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of jgit, jython.
-            apache-commons-jxpath:
-                buildorder: 10
-                ref: 7c35c5e5ce72be2b0a8a6f0301d40c0e2735d7d6
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            apiguardian:
-                buildorder: 10
-                ref: 2bc34157414ff48092b90dbe7f2f7c38592b7dc0
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, junit5.
-            batik:
-                buildorder: 20
-                ref: 9dced5fb157cf748335bf2d5d7c68d128020cae8
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            felix-gogo-command:
-                buildorder: 20
-                ref: b1fe493645a238075f2973a77cd8a424dd1f761c
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            felix-gogo-runtime:
-                buildorder: 10
-                ref: 956c06eccbbeeb7472429d82ebbb376e38c9e494
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, felix-gogo-command,
-                         felix-gogo-shell.
-            felix-gogo-shell:
-                buildorder: 20
-                ref: 5d07b9cfd0562104c730399b7e866607a5f1bb0d
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            felix-scr:
-                buildorder: 30
-                ref: 07b8b2b930029bba0b3fd615995f175191a1fc49
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            glassfish-annotation-api:
-                buildorder: 10
-                ref: 1083d7d7cfc5dda359c8765ff01d954e93853259
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            glassfish-el:
-                buildorder: 10
-                ref: a6470e87fbc6ef7dda82e3af9831921022a2f212
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, glassfish-jsp-api.
-            glassfish-jsp:
-                buildorder: 30
-                ref: 36157c7915abfd265470095964a48d6d126c570c
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            glassfish-jsp-api:
-                buildorder: 20
-                ref: d265b837dff34eb4f6d7f1098f1c2557e0a5b69a
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, glassfish-jsp.
-            glassfish-servlet-api:
-                buildorder: 10
-                ref: f02e63a6d0cc25e7bd87386d5f0c1044b72bc66e
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, glassfish-jsp-api, jetty.
-            google-gson:
-                buildorder: 10
-                ref: a737bc830ea01deb55e1270530b83cc33d3d7239
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, eclipse-cdt, jgit,
-                         eclipse-m2e-core, eclipse-webtools.
-            hamcrest:
-                buildorder: 10
-                ref: a831974f0645acd02cc9e45b6000600df06d4c1d
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, junit.
-            icu4j:
-                buildorder: 10
-                ref: b8f25ab8bb3c7f743d285bfe975b2e03cd60c775
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, jython.
-            jetty:
-                buildorder: 20
-                ref: d118246c18303db25f8fd537da9cb386aca3a39a
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, jgit,
-                         eclipse-m2e-core, eclipse-webtools.
-            jsch:
-                buildorder: 20
-                ref: 2d4a7ac1de3428629fbb8b2ce39d11cdeda2cf5c
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, jgit.
-            junit:
-                buildorder: 20
-                ref: 0013bb14b65f69a0a2e7dbc9067469b9ad659231
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, junit5.
-            junit5:
-                buildorder: 30
-                ref: 320abd749c8b8f428201e5b6453b203a72b3451c
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            jzlib:
-                buildorder: 10
-                ref: b882db1ce843e64d00480d27685edbe616a978dd
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of jgit, jsch.
-            lucene:
-                buildorder: 10
-                ref: 536d705c588014660a79149415248949e5f54b52
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, eclipse-m2e-core, maven-indexer.
-            objectweb-asm:
-                buildorder: 10
-                ref: 5ea6b069478dc085369c89bace570ceb4e2d91ac
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, eclipse-ecf, jython.
-            opentest4j:
-                buildorder: 10
-                ref: 1c299262ff6f99b3fd1ff59aa5dba8dc2ded5ad1
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, junit5.
-            sat4j:
-                buildorder: 10
-                ref: 9eef24552954f67a3665c03999534aba93f7841a
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse.
-            univocity-parsers:
-                buildorder: 10
-                ref: 308edfaa2f045f051b09bfe242e2dc11deae5738
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of junit5.
-            xml-commons-apis:
-                buildorder: 10
-                ref: 8e7362fa604149abb4d98ec0f71eb6f81b5b76e7
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of batik, eclipse, eclipse-emf.
-            xmlgraphics-commons:
-                buildorder: 10
-                ref: 304701c3c83b6b404ba3ea90ce465c93f5398272
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of batik.
-            xz-java:
-                buildorder: 10
-                ref: 98718fbc46b6b425041094df31314149ccd7671b
-                arches: [x86_64]
-                rationale: >
-                    Runtime dependency of eclipse, apache-commons-compress.