diff --git a/Resources/Maps/_NF/Shuttles/Security/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/cleric.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/empress.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/enforcer.yml b/Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/enforcer.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/fighter.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/hospitaller.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/inquisitor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/inquisitor.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/interceptor.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/marauder.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/opportunity.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/prowler.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/rogue.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/templar.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/trident.yml b/Resources/Maps/_NF/Shuttles/Nfsd/trident.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/trident.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/trident.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/wasp.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/whiskey.yml b/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/whiskey.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/cleric.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
index 9c9a2488ff3..8624447b653 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/cleric.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/cleric.yml
 
 - type: gameMap
   id: Cleric
   mapName: 'NSF Cleric'
-  mapPath: /Maps/_NF/Shuttles/Security/cleric.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/cleric.yml
   minPlayers: 0
   stations:
     Cleric:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
similarity index 82%
rename from Resources/Prototypes/_NF/Shipyard/Security/empress.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
index 23ea5ea0eda..65ceeca721b 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -1,16 +1,16 @@
 - type: vessel
   id: Empress
   name: NSF Empress
-  description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of security.
+  description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd.
   price: 170000 #Appraisal value is 150000
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/empress.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml
 
 - type: gameMap
   id: Empress
   mapName: 'NSF Empress'
-  mapPath: /Maps/_NF/Shuttles/Security/empress.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/empress.yml
   minPlayers: 0
   stations:
     Empress:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
index 455ea28a6a2..20bbcf0c2e3 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
@@ -5,12 +5,12 @@
   # price: 21350
   # category: Small
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/enforcer.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml
 
 # - type: gameMap
   # id: Enforcer
   # mapName: 'NSF Enforcer'
-  # mapPath: /Maps/_NF/Shuttles/Security/enforcer.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml
   # minPlayers: 0
   # stations:
     # Enforcer:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/fighter.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
index 1763ac0bf41..b5f09a9584a 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/fighter.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/fighter.yml
 
 - type: gameMap
   id: Fighter
   mapName: 'NSF Fighter'
-  mapPath: /Maps/_NF/Shuttles/Security/fighter.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/fighter.yml
   minPlayers: 0
   stations:
     Fighter:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
similarity index 85%
rename from Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
index 154cfad9122..9140d00ed68 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
@@ -5,12 +5,12 @@
   price: 28220
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/hospitaller.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml
 
 - type: gameMap
   id: Hospitaller
   mapName: 'NSF Hospitaller'
-  mapPath: /Maps/_NF/Shuttles/Security/hospitaller.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml
   minPlayers: 0
   stations:
     Hospitaller:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
similarity index 84%
rename from Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
index d0d3dbda15e..b74d7ea1b53 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
@@ -5,12 +5,12 @@
   price: 29000
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/inquisitor.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
 
 - type: gameMap
   id: Inquisitor
   mapName: 'NSF Inquisitor'
-  mapPath: /Maps/_NF/Shuttles/Security/inquisitor.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
   minPlayers: 0
   stations:
     Inquisitor:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
similarity index 84%
rename from Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
index 851af76029c..db925fb3009 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
@@ -5,12 +5,12 @@
   price: 21350
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/interceptor.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml
 
 - type: gameMap
   id: Interceptor
   mapName: 'NSF Interceptor'
-  mapPath: /Maps/_NF/Shuttles/Security/interceptor.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml
   minPlayers: 0
   stations:
     Interceptor:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/marauder.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
index f185e49325d..76041bbd1fd 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
@@ -5,12 +5,12 @@
   price: 111550
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/marauder.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/marauder.yml
 
 - type: gameMap
   id: Marauder
   mapName: 'NSF Marauder'
-  mapPath: /Maps/_NF/Shuttles/Security/marauder.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/marauder.yml
   minPlayers: 0
   stations:
     Marauder:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
index d4437f1c2bf..dcb6086fe75 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
@@ -5,12 +5,12 @@
   # price: 70000
   # category: Medium
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/opportunity.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml
 
 # - type: gameMap
   # id: Opportunity
   # mapName: 'NSF Opportunity'
-  # mapPath: /Maps/_NF/Shuttles/Security/opportunity.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml
   # minPlayers: 0
   # stations:
     # Opportunity:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/prowler.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
index 3d5a070749c..6bfe750ee4c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
@@ -5,12 +5,12 @@
   price: 49220
   category: Medium
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/prowler.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml
 
 - type: gameMap
   id: Prowler
   mapName: 'NSF Prowler'
-  mapPath: /Maps/_NF/Shuttles/Security/prowler.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/prowler.yml
   minPlayers: 0
   stations:
     Prowler:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/rogue.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
index 60b9fb9a401..c7e5c337fa8 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/rogue.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/rogue.yml
 
 - type: gameMap
   id: Rogue
   mapName: 'NSF Rogue'
-  mapPath: /Maps/_NF/Shuttles/Security/rogue.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/rogue.yml
   minPlayers: 0
   stations:
     Rogue:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
similarity index 85%
rename from Resources/Prototypes/_NF/Shipyard/Security/templar.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
index b339915e099..3321cf8ad3f 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
@@ -5,12 +5,12 @@
   price: 24220
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/templar.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml
 
 - type: gameMap
   id: Templar
   mapName: 'NSF Templar'
-  mapPath: /Maps/_NF/Shuttles/Security/templar.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/templar.yml
   minPlayers: 0
   stations:
     Templar:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/trident.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
index be8f24929c9..d1f336ccd17 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
@@ -5,12 +5,12 @@
   # price: 49300
   # category: Medium
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/trident.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/trident.yml
 
 # - type: gameMap
   # id: Trident
   # mapName: 'NSF Trident'
-  # mapPath: /Maps/_NF/Shuttles/Security/trident.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/trident.yml
   # minPlayers: 0
   # stations:
     # Trident:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/wasp.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
index 33c723de7dc..23c663dfbed 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
@@ -5,12 +5,12 @@
   price: 135000
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/wasp.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/wasp.yml
 
 - type: gameMap
   id: Wasp
   mapName: 'NSF Wasp'
-  mapPath: /Maps/_NF/Shuttles/Security/wasp.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/wasp.yml
   minPlayers: 0
   stations:
     Wasp:
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml
new file mode 100644
index 00000000000..f2a7363cc6b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml
@@ -0,0 +1,26 @@
+# - type: vessel
+#  id: Whiskey
+#  name: NSF Whiskey
+#  description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot.
+#  price: 55000
+#  category: Medium
+#  group: Security
+#  shuttlePath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml
+
+# - type: gameMap
+#  id: Whiskey
+#  mapName: 'NSF Whiskey'
+#  mapPath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml
+#  minPlayers: 0
+#  stations:
+#    Whiskey:
+#      stationProto: StandardFrontierVessel
+#      components:
+#        - type: StationNameSetup
+#          mapNameTemplate: 'Whiskey {1}'
+#          nameGenerator:
+#            !type:NanotrasenNameGenerator
+#            prefixCreator: '14'
+#        - type: StationJobs
+#          overflowJobs: []
+#          availableJobs: {}
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml
deleted file mode 100644
index 8c303e79e9c..00000000000
--- a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: vessel
-  id: Whiskey
-  name: NSF Whiskey
-  description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot.
-  price: 55000
-  category: Medium
-  group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/whiskey.yml
-
-- type: gameMap
-  id: Whiskey
-  mapName: 'NSF Whiskey'
-  mapPath: /Maps/_NF/Shuttles/Security/whiskey.yml
-  minPlayers: 0
-  stations:
-    Whiskey:
-      stationProto: StandardFrontierVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Whiskey {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          overflowJobs: []
-          availableJobs: {}
\ No newline at end of file