Reorganization including fixing blockinfile being used multiple times on the same file causing entries to get overwritten.

facts/workstation/package.yml

@@ -4,6 +4,7 @@
 
 - name: Facts | Workstation | Package | Pop OS
   set_fact:
+    flatpak_distro: yes sir
     firefox: firefox
     firefox_esr: firefox-esr
     thunderbird: thunderbird
@@ -13,6 +14,7 @@
 
 - name: Facts | Workstation | Package | Debian and Ubuntu
   set_fact:
+    flatpak_distro: yes sir
     firefox: firefox
     firefox_esr: firefox-esr
     thunderbird: thunderbird
@@ -22,6 +24,7 @@
 
 - name: Facts | Workstation | Package | FreeBSD
   set_fact:
+    flatpak_distro: false
     firefox: firefox
     firefox_esr: firefox-esr
     thunderbird: thunderbird

facts/workstation/system.yml

@@ -1,19 +0,0 @@
----
-# Define file, folder, and other facts per OS.
-
-- name: Facts | Workstation | System | Pop OS
-  set_fact:
-    flatpak_distro: yes sir
-  when: ansible_distribution == "Pop!_OS"
-
-
-- name: Facts | Workstation | System | Debian and Ubuntu
-  set_fact:
-    flatpak_distro: yes sir
-  when: ansible_distribution in ("Debian","Ubuntu")
-
-
-- name: Facts | Workstation | System | FreeBSD
-  set_fact:
-    flatpak_distro: false
-  when: ansible_system == "FreeBSD"