diff --git a/roles/linroom/tasks/Android_Studio.yml b/roles/linroom/tasks/Android_Studio.yml
deleted file mode 100644
index da7ceee..0000000
--- a/roles/linroom/tasks/Android_Studio.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- name: Install Android Studio
-  block:
-  - name: Create destination for Android Studio
-    file:
-      path: /opt/Android_Studio
-      state: directory
-  - name: Download and unpack Android Studio
-    unarchive:
-      # src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.3.1.16/android-studio-2021.3.1.16-linux.tar.gz 
-      src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.19/android-studio-2022.3.1.19-linux.tar.gz
-      creates: /opt/Android_Studio/android-studio/build.txt
-      dest: /opt/Android_Studio
-      remote_src: yes
diff --git a/roles/linroom/tasks/all_classes.yml b/roles/linroom/tasks/all_classes.yml
new file mode 100644
index 0000000..1fee6d2
--- /dev/null
+++ b/roles/linroom/tasks/all_classes.yml
@@ -0,0 +1,60 @@
+- import_tasks: AAHRP-63263.yml
+- import_tasks: APS1-63279.yml
+- import_tasks: ARP1-63545C.yml
+- import_tasks: BMO-63259.yml
+- import_tasks: DF-63530.yml
+- import_tasks: DN-63260.yml
+- import_tasks: DPS-63744.yml
+- import_tasks: DV-63718.yml
+- import_tasks: EP-63249.yml
+- import_tasks: FP-63507.yml
+- import_tasks: GO-63715.yml
+- import_tasks: IS-63714.yml
+- import_tasks: IVZ-63521.yml
+- import_tasks: KCR-63550.yml
+- import_tasks: KPOV-63716.yml
+- import_tasks: KRV-63528.yml
+- import_tasks: MRO-63257.yml
+- import_tasks: MV-63288.yml
+- import_tasks: NDN-63729.yml
+- import_tasks: NM-63522.yml
+- import_tasks: NPMP-63512.yml
+- import_tasks: NRG-63553.yml
+- import_tasks: OBSS-63514.yml
+- import_tasks: ODV-63204.yml
+- import_tasks: OO-63271.yml
+- import_tasks: OR-63717.yml
+- import_tasks: ORS-63218.yml
+- import_tasks: OS-63709.yml
+- import_tasks: OS-63741.yml
+- import_tasks: OUI-63214.yml
+- import_tasks: P2-63278.yml
+- import_tasks: P2-63706.yml
+- import_tasks: PA-63737.yml
+- import_tasks: PB-63707.yml
+- import_tasks: PB2-63713.yml
+- import_tasks: PJC-63769.yml
+- import_tasks: PPJ-63220.yml
+- import_tasks: PS-63261.yml
+- import_tasks: PSP-63287.yml
+- import_tasks: PUI-63768.yml
+- import_tasks: RA-63703.yml
+- import_tasks: RGTI-63269.yml
+- import_tasks: RIS-63252.yml
+- import_tasks: RK-63209.yml
+- import_tasks: RK-63708.yml
+- import_tasks: RPOI-90066.yml
+- import_tasks: RZP-63523.yml
+- import_tasks: SP-63255.yml
+- import_tasks: ST-63727.yml
+- import_tasks: SU-63519.yml
+- import_tasks: TINR-63740.yml
+- import_tasks: TIS-63216.yml
+- import_tasks: TUP-63226.yml
+- import_tasks: UI-63720.yml
+- import_tasks: UV-63721.yml
+- import_tasks: UZ-63267.yml
+- import_tasks: VN-63728.yml
+- import_tasks: VP-63775.yml
+- import_tasks: VPSA-63735.yml
+- import_tasks: VZR-63543.yml
diff --git a/roles/linroom/tasks/main.yml b/roles/linroom/tasks/main.yml
index a7f53c7..54eafb9 100644
--- a/roles/linroom/tasks/main.yml
+++ b/roles/linroom/tasks/main.yml
@@ -1,61 +1,2 @@
 - import_tasks: fri_base.yml 
-- import_tasks: AAHRP-63263.yml
-- import_tasks: APS1-63279.yml
-- import_tasks: ARP1-63545C.yml
-- import_tasks: BMO-63259.yml
-- import_tasks: DF-63530.yml
-- import_tasks: DN-63260.yml
-- import_tasks: DPS-63744.yml
-- import_tasks: DV-63718.yml
-- import_tasks: EP-63249.yml
-- import_tasks: FP-63507.yml
-- import_tasks: GO-63715.yml
-- import_tasks: IS-63714.yml
-- import_tasks: IVZ-63521.yml
-- import_tasks: KCR-63550.yml
-- import_tasks: KPOV-63716.yml
-- import_tasks: KRV-63528.yml
-- import_tasks: MRO-63257.yml
-- import_tasks: MV-63288.yml
-- import_tasks: NDN-63729.yml
-- import_tasks: NM-63522.yml
-- import_tasks: NPMP-63512.yml
-- import_tasks: NRG-63553.yml
-- import_tasks: OBSS-63514.yml
-- import_tasks: ODV-63204.yml
-- import_tasks: OO-63271.yml
-- import_tasks: OR-63717.yml
-- import_tasks: ORS-63218.yml
-- import_tasks: OS-63709.yml
-- import_tasks: OS-63741.yml
-- import_tasks: OUI-63214.yml
-- import_tasks: P2-63278.yml
-- import_tasks: P2-63706.yml
-- import_tasks: PA-63737.yml
-- import_tasks: PB-63707.yml
-- import_tasks: PB2-63713.yml
-- import_tasks: PJC-63769.yml
-- import_tasks: PPJ-63220.yml
-- import_tasks: PS-63261.yml
-- import_tasks: PSP-63287.yml
-- import_tasks: PUI-63768.yml
-- import_tasks: RA-63703.yml
-- import_tasks: RGTI-63269.yml
-- import_tasks: RIS-63252.yml
-- import_tasks: RK-63209.yml
-- import_tasks: RK-63708.yml
-- import_tasks: RPOI-90066.yml
-- import_tasks: RZP-63523.yml
-- import_tasks: SP-63255.yml
-- import_tasks: ST-63727.yml
-- import_tasks: SU-63519.yml
-- import_tasks: TINR-63740.yml
-- import_tasks: TIS-63216.yml
-- import_tasks: TUP-63226.yml
-- import_tasks: UI-63720.yml
-- import_tasks: UV-63721.yml
-- import_tasks: UZ-63267.yml
-- import_tasks: VN-63728.yml
-- import_tasks: VP-63775.yml
-- import_tasks: VPSA-63735.yml
-- import_tasks: VZR-63543.yml
+- import_tasks: all_classes.yml
diff --git a/roles/winroom/tasks/Android_Studio.yml b/roles/winroom/tasks/android_studio.yml
similarity index 100%
rename from roles/winroom/tasks/Android_Studio.yml
rename to roles/winroom/tasks/android_studio.yml
diff --git a/roles/winroom/tasks/Eclipse.yml b/roles/winroom/tasks/eclipse.yml
similarity index 100%
rename from roles/winroom/tasks/Eclipse.yml
rename to roles/winroom/tasks/eclipse.yml