diff --git a/anda/apps/intellij-community-idea/anda.hcl b/anda/apps/intellij-community-idea/anda.hcl
deleted file mode 100644
index e34b975e5e..0000000000
--- a/anda/apps/intellij-community-idea/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "intellij-community-idea.spec"
-	}
-}
diff --git a/anda/apps/intellij-ultimate-idea/anda.hcl b/anda/apps/intellij-ultimate-idea/anda.hcl
deleted file mode 100644
index 167588aa4a..0000000000
--- a/anda/apps/intellij-ultimate-idea/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "intellij-ultimate-idea.spec"
-	}
-}
diff --git a/anda/devs/intellij-idea-community/anda.hcl b/anda/devs/intellij-idea-community/anda.hcl
new file mode 100644
index 0000000000..9954505e27
--- /dev/null
+++ b/anda/devs/intellij-idea-community/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "intellij-idea-community.spec"
+	}
+}
diff --git a/anda/apps/intellij-community-idea/enable-no-jdr.patch b/anda/devs/intellij-idea-community/enable-no-jdr.patch
similarity index 100%
rename from anda/apps/intellij-community-idea/enable-no-jdr.patch
rename to anda/devs/intellij-idea-community/enable-no-jdr.patch
diff --git a/anda/apps/intellij-community-idea/intellij-community-idea.spec b/anda/devs/intellij-idea-community/intellij-idea-community.spec
similarity index 93%
rename from anda/apps/intellij-community-idea/intellij-community-idea.spec
rename to anda/devs/intellij-idea-community/intellij-idea-community.spec
index 0edf795670..ad058bb81f 100644
--- a/anda/apps/intellij-community-idea/intellij-community-idea.spec
+++ b/anda/devs/intellij-idea-community/intellij-idea-community.spec
@@ -1,4 +1,4 @@
-Name:			intellij-community-idea
+Name:			intellij-idea-community
 Version:		231.9161.38
 Release:		1%?dist
 Summary:		IDE for Java/Groovy/etc. with advanced refactoring features
@@ -8,8 +8,8 @@ Source0:		https://github.com/JetBrains/intellij-community/archive/refs/tags/idea
 Source1:		https://github.com/JetBrains/android/archive/refs/tags/idea/%version.tar.gz
 Source2:		https://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar
 Patch0:			enable-no-jdr.patch
-Requires:		giflib java-17-openjdk python3 bash libdbusmenu fontconfig hicolor-icon-theme
-BuildRequires:	ant git java-17-openjdk-devel maven
+Requires:		giflib java-latest-openjdk python3 bash libdbusmenu fontconfig hicolor-icon-theme
+BuildRequires:	ant git java-latest-openjdk-devel maven
 
 %description
 Intellij IDEA is an IDE for Java, Groovy and other programming languages with
diff --git a/anda/apps/intellij-community-idea/update.rhai b/anda/devs/intellij-idea-community/update.rhai
similarity index 100%
rename from anda/apps/intellij-community-idea/update.rhai
rename to anda/devs/intellij-idea-community/update.rhai
diff --git a/anda/devs/intellij-idea-ultimate/anda.hcl b/anda/devs/intellij-idea-ultimate/anda.hcl
new file mode 100644
index 0000000000..88a19a65eb
--- /dev/null
+++ b/anda/devs/intellij-idea-ultimate/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "intellij-idea-ultimate.spec"
+	}
+}
diff --git a/anda/apps/intellij-ultimate-idea/intellij-ultimate-idea.spec b/anda/devs/intellij-idea-ultimate/intellij-idea-ultimate.spec
similarity index 96%
rename from anda/apps/intellij-ultimate-idea/intellij-ultimate-idea.spec
rename to anda/devs/intellij-idea-ultimate/intellij-idea-ultimate.spec
index 2e216e5d86..2925555572 100644
--- a/anda/apps/intellij-ultimate-idea/intellij-ultimate-idea.spec
+++ b/anda/devs/intellij-idea-ultimate/intellij-idea-ultimate.spec
@@ -3,7 +3,7 @@
 %global jbr_build aarch64-b469
 %global jbr_minor 82
 
-Name:		intellij-ultimate-idea
+Name:		intellij-idea-ultimate
 Version:	2023.1.3
 Release:	1%?dist
 Summary:	IDE for Java/Groovy/etc. with advanced refactoring features
@@ -12,7 +12,7 @@ URL:		https://jetbrains.com/idea
 Source0:	https://download.jetbrains.com/idea/ideaIU-%version.tar.gz
 Requires:	giflib libXtst libXrender
 Suggests:	%name-jre
-Recommends:	libdbusmenu java-17-openjdk
+Recommends:	libdbusmenu java-latest-openjdk
 
 
 %ifarch aarch64