diff --git a/inventory/fixtures/inventory.yaml b/inventory/fixtures/inventory.yaml
index 2a9a4b9..2a608fd 100644
--- a/inventory/fixtures/inventory.yaml
+++ b/inventory/fixtures/inventory.yaml
@@ -61,190 +61,6 @@
 - model: inventory.RaidType
   fields:
     name: "RAID 60"
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows XP'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 7 Home'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 7 Pro'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 7 Enterprise'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8 Home'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8 Pro'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8 Enterprise'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8.1 Home'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8.1 Pro'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 8.1 Enterprise'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 10 Home'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 10 Pro'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: FreeBSD
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'VMware ESXi 6.5.0'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 10 Enterprise'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Server 2003'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Server 2008'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Server 2012'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Server 2012 R2'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Server 2016'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Ubuntu 14.04'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Ubuntu 16.04'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'VMware ESXi 6.0.0'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'pfsense 2.4.x'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'VMware vCenter Server Appliance 6.0.0'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 4.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 5.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 6.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 7.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 8.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 9.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 10.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'iOS 11.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 4.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 5.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 6.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 7.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 8.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 9.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 10.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'tvOS 11.X'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'VMware ESXi 5.5.0'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'VMware vCenter Server Appliance 6.5.0'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows Storage Server 2016 Standard'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Windows 7 Home Premium'
--
-  model: inventory.OperatingSystem
-  fields:
-    name: 'Ubuntu 18.04'
 
   model: inventory.Ram
   fields:
diff --git a/inventory/models/__init__.py b/inventory/models/__init__.py
index 0dc454e..3790fae 100644
--- a/inventory/models/__init__.py
+++ b/inventory/models/__init__.py
@@ -5,7 +5,6 @@ from .cpu import CpuArchitecture, CpuManufacturer, Cpu
 from .disk import DiskType, Disk
 from .license import (License, ComputerLicense, UserLicense,
                       LicenseWithComputer, LicenseWithUser)
-from .os import OperatingSystem
 from .raid import DisksInRaid, RaidType, Raid
 from .ram import RamType, Ram
 from .software import SoftwareArchitecture, SoftwareCategory, Software
diff --git a/softwares/fixtures/softwares.yaml b/softwares/fixtures/softwares.yaml
index 3c1a21a..77fd677 100644
--- a/softwares/fixtures/softwares.yaml
+++ b/softwares/fixtures/softwares.yaml
@@ -142,3 +142,187 @@
   fields:
     name: 'Panda Antivirus Pro'
     category: '3'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows XP'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 7 Home'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 7 Pro'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 7 Enterprise'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8 Home'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8 Pro'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8 Enterprise'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8.1 Home'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8.1 Pro'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 8.1 Enterprise'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 10 Home'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 10 Pro'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: FreeBSD
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'VMware ESXi 6.5.0'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 10 Enterprise'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Server 2003'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Server 2008'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Server 2012'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Server 2012 R2'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Server 2016'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Ubuntu 14.04'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Ubuntu 16.04'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'VMware ESXi 6.0.0'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'pfsense 2.4.x'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'VMware vCenter Server Appliance 6.0.0'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 4.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 5.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 6.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 7.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 8.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 9.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 10.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'iOS 11.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 4.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 5.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 6.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 7.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 8.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 9.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 10.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'tvOS 11.X'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'VMware ESXi 5.5.0'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'VMware vCenter Server Appliance 6.5.0'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows Storage Server 2016 Standard'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Windows 7 Home Premium'
+-
+  model: inventory.OperatingSystem
+  fields:
+    name: 'Ubuntu 18.04'
diff --git a/inventory/models/os.py b/softwares/models/os.py
similarity index 100%
rename from inventory/models/os.py
rename to softwares/models/os.py