diff --git a/settings/emma_chopper_lifter/README b/settings/emma_chopper_lifter/README
deleted file mode 100644
index 1691311..0000000
--- a/settings/emma_chopper_lifter/README
+++ /dev/null
@@ -1,20 +0,0 @@
-README
-------
-
-This folder contains several example settings files used to set up the emma chopper lifter.
-
-To use the files, they should both be placed in the galil folder of the main settings directory (e.g. C:\Instrument\Settings\config\NDXINST\configurations\galil)
-
------------
-galil1.cmd
------------
-
-This file loads the control program onto the Galil. This is for galil using motor control number 1 (i.e. for motors with prefix IN:[INST]:MOT:MTR01*). You will need a similar galilN.cmd if using another controller.
-
---------------------
-motorExtensions.cmd
---------------------
-
-Put this in the Galil directory with your other 2 files. It tells the IOC where to look for the emma_chopper_lifter.cmd file.
-
-
diff --git a/settings/emma_chopper_lifter/emma_chopper_lifter.cmd b/settings/emma_chopper_lifter/emma_chopper_lifter.cmd
deleted file mode 100644
index 7f1e4b5..0000000
--- a/settings/emma_chopper_lifter/emma_chopper_lifter.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-############ Emma chopper lifter ############
-
-epicsEnvSet "CONTROLLER_NUMBER" "1"
-
-calc("CNUM_PADDED", "$(CONTROLLER_NUMBER=1)", 2, 2)
-
-$(IFSIM) epicsEnvSet "OTYP" "Soft Channel"
-dbLoadRecords("$(MOTOREXT)/db/emmaChopperLifter.db", "PV_PREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)MOT:,D=DMC$(CNUM_PADDED)")
diff --git a/settings/emma_chopper_lifter/galil1.cmd b/settings/emma_chopper_lifter/galil1.cmd
deleted file mode 100644
index bbbc8ab..0000000
--- a/settings/emma_chopper_lifter/galil1.cmd
+++ /dev/null
@@ -1,18 +0,0 @@
-## configure galil crate 1
-
-GalilCreateController("Galil", "$(GALILADDR01)", 20)
- 
-GalilCreateAxis("Galil","A",0,"",1)
-GalilCreateAxis("Galil","B",0,"",1)
-GalilCreateAxis("Galil","C",0,"",1)
-GalilCreateAxis("Galil","D",0,"",1)
-GalilCreateAxis("Galil","E",0,"",1)
-GalilCreateAxis("Galil","F",0,"",1)
-GalilCreateAxis("Galil","G",0,"",1)
-GalilCreateAxis("Galil","H",0,"",1)
-
-$(IFNEWGALIL=#) GalilCreateCSAxes("Galil")
-
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc!$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc!$(GALIL)/gmc/galil_emma_chopper_lifter.gmc",0,0,3)
-
-$(IFNEWGALIL=#) GalilCreateProfile("Galil", 2000)
diff --git a/settings/emma_chopper_lifter/motorExtensions.cmd b/settings/emma_chopper_lifter/motorExtensions.cmd
deleted file mode 100644
index 0f8e126..0000000
--- a/settings/emma_chopper_lifter/motorExtensions.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-############ Motor Extensions ##############
-# Create a soft motor record on top of a normal motor record
-# Copy this file to C:\Instrument\Settings\config\<machine>\configurations\galil
-
-< $(GALILCONFIG)/emma_chopper_lifter.cmd
diff --git a/settings/gem_jaws/jaws.cmd b/settings/gem_jaws/jaws.cmd
deleted file mode 100644
index b8631e4..0000000
--- a/settings/gem_jaws/jaws.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-############ GEM jaws ##############
-# Create a soft motor record on top of a normal motor record which allow the gap to be set for the motor
-# Copy this file to C:\Instrument\Settings\config\<machine>\configurations\linmot AND C:\Instrument\Settings\config\<machine>\configurations\galil
-
-# Beamscraper jaws on LINMOT_01
-$(IFIOC_LINMOT_01=#) dbLoadRecords("$(MOTOREXT)/db/gem_beamscraper_jawset.db", "P=$(MYPVPREFIX)MOT:, RECSIM=$(RECSIM), JAWS=JAWS6:, N_MTR=MTR0101, S_MTR=MTR0102, W_MTR=MTR0103, E_MTR=MTR0104")
-$(IFIOC_LINMOT_01=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:, JAWS=JAWS6:, mXN=JAWS6:CAL_N, mXS=JAWS6:CAL_S, mXW=JAWS6:CAL_W, mXE=JAWS6:CAL_E, EGU=mm, CENT_DISP=1")
-
-# Beamline jaws on GALIL_01, GALIL_02, GALIL_03
-$(IFIOC_GALIL_01=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS1:,mXN=MTR0104,mXS=MTR0103,mXW=MTR0102,mXE=MTR0101,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_01=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS2:,mXN=MTR0108,mXS=MTR0107,mXW=MTR0106,mXE=MTR0105,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS3:,mXN=MTR0204,mXS=MTR0203,mXW=MTR0202,mXE=MTR0201,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS4:,mXN=MTR0208,mXS=MTR0207,mXW=MTR0206,mXE=MTR0205,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_03=#) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS5:,mXN=MTR0301,mXS=MTR0303,mXW=MTR0304,mXE=MTR0302,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_01=#) dbLoadRecords("$(MOTOREXT)/db/gem_beamline_jawset.db", "P=$(MYPVPREFIX), MOD_TO_JAWS1=6322, MOD_TO_JAWS2=8128, MOD_TO_JAWS3=10329, MOD_TO_JAWS4=12643, MOD_TO_JAWS5=15389, MOD_TO_SAMPLE=17000")
diff --git a/settings/gem_jaws/motorExtensions.cmd b/settings/gem_jaws/motorExtensions.cmd
deleted file mode 100644
index a35e4f7..0000000
--- a/settings/gem_jaws/motorExtensions.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-############ Motor Extensions ##############
-# Create a soft motor record on top of a normal motor record which allow the gap to be set for the motor
-# Copy this file to C:\Instrument\Settings\config\<machine>\configurations\galil
-
-$(IFTESTRECSIM) $(IFGEMJAWS=#) < $(MOTOREXT)/settings/gem_jaws/jaws.cmd
diff --git a/settings/jaws_manager/galil01.cmd b/settings/jaws_manager/galil01.cmd
new file mode 100644
index 0000000..ed72c28
--- /dev/null
+++ b/settings/jaws_manager/galil01.cmd
@@ -0,0 +1,12 @@
+GalilCreateController("Galil", "$(GALILADDR)", -20)
+
+GalilCreateAxis("Galil","A",1,"",1)
+GalilCreateAxis("Galil","B",1,"",1)
+GalilCreateAxis("Galil","C",1,"",1)
+GalilCreateAxis("Galil","D",1,"",1)
+GalilCreateAxis("Galil","E",1,"",1)
+GalilCreateAxis("Galil","F",1,"",1)
+GalilCreateAxis("Galil","G",1,"",1)
+GalilCreateAxis("Galil","H",1,"",1)
+
+GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/loqAperture/galil01.cmd b/settings/loqAperture/galil01.cmd
new file mode 100644
index 0000000..5e3208e
--- /dev/null
+++ b/settings/loqAperture/galil01.cmd
@@ -0,0 +1,31 @@
+## configure galil crate 1
+
+## passed parameters
+##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
+##   GALILADDR - address of this galil
+
+## see README_galil_cmd.txt for usage of commands below
+
+GalilCreateController("Galil", "$(GALILADDR)", 20)
+
+GalilCreateAxis("Galil","A",0,"",1)
+GalilCreateAxis("Galil","B",0,"",1)
+GalilCreateAxis("Galil","C",0,"",1)
+GalilCreateAxis("Galil","D",0,"",1)
+GalilCreateAxis("Galil","E",0,"",1)
+GalilCreateAxis("Galil","F",0,"",1)
+GalilCreateAxis("Galil","G",0,"",1)
+GalilCreateAxis("Galil","H",0,"",1)
+
+epicsEnvSet "HOME_HEADER" "$(GALIL)/gmc/galil_Default_Header.gmc"
+epicsEnvSet "HOME_MODE_1" "$(GALIL)/gmc/galil_Home_RevLimit.gmc"
+epicsEnvSet "HOME_MODE_2" "$(GALIL)/gmc/galil_Home_RevLimit.gmc"
+epicsEnvSet "HOME_MODE_3" "$(GALIL)/gmc/galil_Home_ForwLimit.gmc"
+epicsEnvSet "HOME_MODE_4" "$(GALIL)/gmc/galil_Home_RevLimit.gmc"
+epicsEnvSet "HOME_MODE_5" "$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc"
+epicsEnvSet "HOME_MODE_6" "$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc"
+epicsEnvSet "HOME_MODE_7" "$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc"
+epicsEnvSet "HOME_MODE_8" "$(GALIL)/gmc/galil_Home_Dummy_Do_Nothing.gmc"
+epicsEnvSet "HOME_FOOTER" "$(GALIL)/gmc/galil_Default_Footer.gmc"
+
+GalilStartController("Galil","$(HOME_HEADER);$(HOME_MODE_1)!$(HOME_MODE_2)!$(HOME_MODE_3)!$(HOME_MODE_4)!$(HOME_MODE_5)!$(HOME_MODE_6)!$(HOME_MODE_7)!$(HOME_MODE_8);$(HOME_FOOTER)",0,0,3)
diff --git a/settings/motorExtensions.cmd b/settings/motorExtensions.cmd
index a35e4f7..301fb8f 100644
--- a/settings/motorExtensions.cmd
+++ b/settings/motorExtensions.cmd
@@ -2,4 +2,4 @@
 # Create a soft motor record on top of a normal motor record which allow the gap to be set for the motor
 # Copy this file to C:\Instrument\Settings\config\<machine>\configurations\galil
 
-$(IFTESTRECSIM) $(IFGEMJAWS=#) < $(MOTOREXT)/settings/gem_jaws/jaws.cmd
+$(IFTESTRECSIM) $(IFGEMJAWS=#) < $(MOTOREXT)/settings/GEM/galil/jaws.cmd
diff --git a/settings/nimrod_jaws/jaws.cmd b/settings/nimrod_jaws/jaws.cmd
deleted file mode 100644
index 95fe97e..0000000
--- a/settings/nimrod_jaws/jaws.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-############ Nimrod jaws ##############
-# Create a soft motor record on top of a normal motor record which allow the gap to be set for the motor
-# Copy this file to C:\Instrument\Settings\config\<machine>\configurations\galil
-
-$(IFIOC_GALIL_01) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS1:,mXN=MTR0103,mXS=MTR0104,mXW=MTR0101,mXE=MTR0102,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_01) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS2:,mXN=MTR0107,mXS=MTR0108,mXW=MTR0105,mXE=MTR0106,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS3:,mXN=MTR0203,mXS=MTR0204,mXW=MTR0201,mXE=MTR0202,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS4:,mXN=MTR0207,mXS=MTR0208,mXW=MTR0205,mXE=MTR0206,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_03) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS5:,mXN=MTR0303,mXS=MTR0304,mXW=MTR0301,mXE=MTR0302,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_03) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS6:,mXN=MTR0307,mXS=MTR0308,mXW=MTR0305,mXE=MTR0306,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-
-# Define jaws as soft motor records using the second galil controller, if present
-$(IFIOC_GALIL_01) dbLoadRecords("$(MOTOREXT)/db/nimrodjawset.db", "P=$(MYPVPREFIX), MOD_TO_JAWS1=6458, MOD_TO_JAWS2=8072, MOD_TO_JAWS3=12072, MOD_TO_JAWS4=15450, MOD_TO_JAWS5=17235, MOD_TO_JAWS6=19691")
diff --git a/settings/oscillatingCollimator/galil01.cmd b/settings/oscillatingCollimator/galil01.cmd
index 238b505..fb365d4 100644
--- a/settings/oscillatingCollimator/galil01.cmd
+++ b/settings/oscillatingCollimator/galil01.cmd
@@ -1,6 +1,6 @@
 ## configure galil crate 1
 
-GalilCreateController("Galil", "$(GALILADDR01)", 20, 1)
+GalilCreateController("Galil", "$(GALILADDR)", 20, 1)
  
 GalilCreateAxis("Galil","A",0,"",1)
 GalilCreateAxis("Galil","B",0,"",1)
diff --git a/settings/oscillatingCollimator_Wish/galil01.cmd b/settings/oscillatingCollimator_Wish/galil01.cmd
index 014746e..eb0457e 100644
--- a/settings/oscillatingCollimator_Wish/galil01.cmd
+++ b/settings/oscillatingCollimator_Wish/galil01.cmd
@@ -1,6 +1,6 @@
 ## configure galil crate 1
 
-GalilCreateController("Galil", "$(GALILADDR01)", 20, 1)
+GalilCreateController("Galil", "$(GALILADDR)", 20, 1)
  
 GalilCreateAxis("Galil","A",0,"",1)
 GalilCreateAxis("Galil","B",0,"",1)
diff --git a/settings/polaris_jaws/jaws.cmd b/settings/polaris_jaws/jaws.cmd
deleted file mode 100644
index 5b98a67..0000000
--- a/settings/polaris_jaws/jaws.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-############ Polaris jaws ##############
-# Create a soft motor record on top of a normal motor record which allow the gap to be set for the motor
-# Copy this file to C:\Instrument\Settings\config\<machine>\configurations\galil
-
-$(IFIOC_GALIL_01) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS1:,mXN=MTR0104,mXS=MTR0103,mXW=MTR0102,mXE=MTR0101,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_01) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS2:,mXN=MTR0108,mXS=MTR0107,mXW=MTR0106,mXE=MTR0105,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS3:,mXN=MTR0204,mXS=MTR0203,mXW=MTR0202,mXE=MTR0201,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS4:,mXN=MTR0208,mXS=MTR0207,mXW=MTR0206,mXE=MTR0205,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-$(IFIOC_GALIL_03) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS5:,mXN=MTR0301,mXS=MTR0303,mXW=MTR0304,mXE=MTR0302,ASG=MANAGER,IFINIT_FROM_AS=$(IFINIT_JAWS_FROM_AS=#),IFNOTINIT_FROM_AS=$(IFNOTINIT_JAWS_FROM_AS=)")
-
-# Define jaws as soft motor records using the second galil controller, if present
-$(IFIOC_GALIL_01) dbLoadRecords("$(MOTOREXT)/db/polarisjawset.db", "P=$(MYPVPREFIX), COL_HEIGHT=79.4, COL_WIDTH=82.2, MOD_TO_SAMPLE=14000, MOD_TO_COL=1610, MOD_TO_JAWS1=6502, MOD_TO_JAWS2=9440, MOD_TO_JAWS3=11085, MOD_TO_JAWS4=11735, MOD_TO_JAWS5=13175")