diff --git a/!Agenda,fd7 b/!Agenda,fd7
deleted file mode 100644
index f9e1a62e460c8d6c4c1bacadf4791c3225896aef..0000000000000000000000000000000000000000
--- a/!Agenda,fd7
+++ /dev/null
@@ -1,17 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Agenda for <Prefix$Dir> ...
-Do AMU -f <Prefix$Dir>.Makefile -desktop -n THROWBACK=-throwback rm.bootcmds
diff --git a/!Cf,fd7 b/!Cf,fd7
deleted file mode 100644
index c1a009629764600f63d2e8756fdfbdc9566df1e9..0000000000000000000000000000000000000000
--- a/!Cf,fd7
+++ /dev/null
@@ -1,17 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Dir <Obey$Dir>
-ObjAsm -stamp -quit s.AddApp o.AddAppC
-ObjAsm -stamp -quit AddApp.s.AddApp o.AddAppAsm
diff --git a/!Changed,fd7 b/!Changed,fd7
deleted file mode 100644
index 4fbef199cc99a9b69f99edceda498285e287f8ce..0000000000000000000000000000000000000000
--- a/!Changed,fd7
+++ /dev/null
@@ -1,15 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Do Modified -nobinary -log -from <Obey$Dir> -to RAM:$ -since 3-sep-1993.0:0:0
diff --git a/!Clean,fd7 b/!Clean,fd7
deleted file mode 100644
index c13ea04c52af51e8ef85cd4d292906a172ffdde0..0000000000000000000000000000000000000000
--- a/!Clean,fd7
+++ /dev/null
@@ -1,17 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Cleaning <Prefix$Dir> ...
-Do AMU -f <Prefix$Dir>.Makefile -desktop clean THROWBACK=-throwback
diff --git a/!Compile,fd7 b/!Compile,fd7
deleted file mode 100644
index 51010f870f8316d158a1635bb5d1090d47b2053f..0000000000000000000000000000000000000000
--- a/!Compile,fd7
+++ /dev/null
@@ -1,17 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Compiling <Prefix$Dir> ...
-Do AMU -f <Prefix$Dir>.Makefile -desktop asms THROWBACK=-throwback
diff --git a/!Debug,fd7 b/!Debug,fd7
deleted file mode 100644
index 97d11c2871c823aced65c3adc768772ac5178c54..0000000000000000000000000000000000000000
--- a/!Debug,fd7
+++ /dev/null
@@ -1,20 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Dir <Obey$Dir>
-|because Prefix can't cope with Run
-Echo Making <Obey$Dir> ...
-WIMPSlot -min 4000K -max 4000K
-Do AMU -f <Obey$Dir>.Makefile -desktop THROWBACK=-throwback rm.bootcmdsd
-Announce "Make done"
diff --git a/!Make,fd7 b/!Make,fd7
deleted file mode 100644
index 2c83022b14fdb009fc58969edcfee1b926551d6b..0000000000000000000000000000000000000000
--- a/!Make,fd7
+++ /dev/null
@@ -1,20 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Dir <Obey$Dir>
-|because Prefix can't cope with Run
-Echo Making <Obey$Dir> ...
-WIMPSlot -min 4000K -max 4000K
-Do AMU -f <Obey$Dir>.Makefile -desktop THROWBACK=-throwback rm.bootcmds
-Announce "Make done"
diff --git a/!Map,fd7 b/!Map,fd7
deleted file mode 100644
index 4584e3789183c749c33c79d43d9f65e3a6e0952c..0000000000000000000000000000000000000000
--- a/!Map,fd7
+++ /dev/null
@@ -1,18 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Mapping <Prefix$Dir> ...
-WIMPSlot -min 1024K -max 1024K
-Do AMU -f <Obey$Dir>.Makefile -desktop map THROWBACK=-throwback
diff --git a/UnsetDebug,feb b/!Mk,fd7
similarity index 85%
rename from UnsetDebug,feb
rename to !Mk,fd7
index 21b9ca0717fd350c73b24a3ac6137068efe89564..ca6a00d74d805dbba11a3967ff3c85fe17f9afda 100644
--- a/UnsetDebug,feb
+++ b/!Mk,fd7
@@ -1,4 +1,4 @@
-| Copyright 1996 Acorn Computers Ltd
+| Copyright 1997 Acorn Computers Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
@@ -12,5 +12,6 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-SetType <Obey$Dir>.Test Absolute
-Unset ColourPicker$Path
+Dir <Obey$Dir>
+amu_machine all
+amu_machine install
diff --git a/MkClean,fd7 b/!MkClean,fd7
similarity index 94%
rename from MkClean,fd7
rename to !MkClean,fd7
index e9d7ade7fd4d0f5126fb63aca74d820946350a83..34414490644ae249865ac3ff485af5fa54fe6e00 100644
--- a/MkClean,fd7
+++ b/!MkClean,fd7
@@ -1,4 +1,4 @@
-| Copyright 1996 Acorn Computers Ltd
+| Copyright 1997 Acorn Computers Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
diff --git a/MkRom,fd7 b/!MkRom,fd7
similarity index 93%
rename from MkRom,fd7
rename to !MkRom,fd7
index 42cd1103e1a784e03f2ad8dff2bf4b4435fee5ce..6b2056e2e084f55e94fe252fd16252227dd6d918 100644
--- a/MkRom,fd7
+++ b/!MkRom,fd7
@@ -1,4 +1,4 @@
-| Copyright 1996 Acorn Computers Ltd
+| Copyright 1997 Acorn Computers Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
diff --git a/!Prepro,fd7 b/!Prepro,fd7
deleted file mode 100644
index 2bca575cc96c539bee150065a58745cdd526a13b..0000000000000000000000000000000000000000
--- a/!Prepro,fd7
+++ /dev/null
@@ -1,17 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Preprocessing <Prefix$Dir> ...
-Do AMU -f <Prefix$Dir>.Makefile -desktop incs THROWBACK=-throwback
diff --git a/!Release,fd7 b/!Release,fd7
deleted file mode 100644
index 5947ef00452d481a4257f1e1a97d8bfd5f689bf2..0000000000000000000000000000000000000000
--- a/!Release,fd7
+++ /dev/null
@@ -1,19 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Prefix <Obey$Dir>
-Echo Releasing <Prefix$Dir> ...
-WIMPSlot -min 1024K -max 1024K
-Do AMU -f <Obey$Dir>.Makefile -desktop release THROWBACK=-throwback
-Announce "Release done"
diff --git a/.gitattributes b/.gitattributes
index 8aa4e9fec94575bb6f976695f74960d46ff8bbc3..e18222e56ab3c6973ff1a96a3fdb5c4efa24125b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,4 +3,3 @@ s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 c/** gitlab-language=c linguist-language=c linguist-detectable=true
 h/** gitlab-language=c linguist-language=c linguist-detectable=true
 CMHG/** gitlab-language=cmhg linguist-language=cmhg linguist-detectable=true
-*,fe1 gitlab-language=make linguist-language=make linguist-detectable=true
diff --git a/Make,feb b/Make,feb
deleted file mode 100644
index 0cc77dc3b7678a33622dfca25634ed2f4337dba9..0000000000000000000000000000000000000000
--- a/Make,feb
+++ /dev/null
@@ -1,18 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Dir <Obey$Dir>
-If "<OS$Path>"="" Then Set OS$Path @.
-Amu &.apprm.Picker
-If "<OS$Path>"="@." Then Unset OS$Path
diff --git a/Makefile,fe1 b/Makefile,fe1
deleted file mode 100644
index 70c38b0a940379c4fe6277dc4062b37746151da6..0000000000000000000000000000000000000000
--- a/Makefile,fe1
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1996 Acorn Computers Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Makefile for BootCommands
-#
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date           Name       Description
-# ----           ----       -----------
-# 12th Sep 1994  JC         Created.
-#
-
-VPATH = @ <Support$Dir>
-
-RESDIR = <resource$dir>.Resources2.${COMPONENT}
-
-#
-# Generic options:
-#
-MKDIR   = cdir
-CC      = cc -ISupport:,OS: -fach -wp -DBOOTCMDS
-CP      = copy
-CPFLAGS = ~cfr~v
-OBJASM  = ObjAsm ${THROWBACK} -depend !Depend -stamp -quit
-CMHG    = CMHG
-LINK    = Link 
-ZM      = -zM
-
-STUBS   = CLib:o.Stubs
-
-#
-# Libraries:
-#
-OSLIB  = OSLib:OSLib.o
-RSTUBS = RISC_OSLib:o.romcstubs
-ABSSYM = RISC_OSLib:o.abssym
-
-#
-# Program specific options:
-#
-COMPONENT = BootCmds
-TARGET    = aof.BootCmds
-
-OBJS = o.files o.header o.main o.Messages o.Repeat o.riscos
-
-OBJSD = o.header o.hostfs debug.m debug.main debug.trace \
-      debug.riscos debug.files o.Repeat o.Messages
-
-ROM_OBJS = o.files o.header o.main o.Repeat o.riscos
-
-ASMS = s.main
-
-RESOURCES = o.Messages o.Repeat
-
-#
-# Generic rules {used by top-level build}:
-#
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
-
-export: 
-	@echo ${COMPONENT}: export complete
-
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-clean:
-	-Destroy RM.BootCmds ${OBJS} ${OBJSD} ${TARGET} map.BootCmds linked.BootCmds \
-        o.repeatcmd Resources.Repeat
-	@echo ${COMPONENT}: cleaned
-
-resources: resources-${CMDHELP}
-	@echo ${COMPONENT}: Resources copied to Messages module
-
-resources_common:
-	${MKDIR} ${RESDIR}
-	${CP} Resources.Messages ${RESDIR}.Messages ${CPFLAGS}
-
-resources-None: resources_common
-	@
-
-resources-: resources_common
-	print Resources.CmdHelp { >> ${RESDIR}.Messages }
-
-
-#
-# ROM target (re-linked at ROM Image build time)
-#
-${TARGET}: ${ROM_OBJS} ${OSLIB} ${RSTUBS}
-	${LINK} -o $@ -aof ${ROM_OBJS} ${OSLIB} ${RSTUBS}
-
-#
-# Final link for the ROM Image (using given base address)
-#
-rom_link:
-	${LINK} -o linked.${COMPONENT} -bin -base ${ADDRESS} ${TARGET} ${ABSSYM} \
-              -map > map.${COMPONENT}
-	truncate map.${COMPONENT} linked.${COMPONENT}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
-
-#
-# Extra {development} rules:
-#
-
-all: RM.BootCmds RM.BootCmdsD
-	@Echo Made all
-
-asms: ${ASMS}
-
-release: RM.BootCmds
-	%Copy RM.BootCmds Root:RM.JCoxhead.BootCmds ~CFLNRV
-	/RM:BootCmds
-	@Echo Made release
-
-#Internal targets
-RM.BootCmds: ${OBJS} ${OSLIB} ${STUBS}
-	${LINK} -rmf -output RM.BootCmds ${OBJS} ${OSLIB} ${STUBS}
-	Access RM.BootCmds WR/R
-
-RM.BootCmdsD: ${OBJSD} ${OSLIB} ${STUBS}
-	${LINK} -rmf -output RM.BootCmdsD ${OBJSD} ${OSLIB} ${STUBS}
-	Access RM.BootCmdsD WR/R
-
-o.Messages: Resources.Messages
-	ResGen Messages o.Messages Resources.Messages Resources.BootCmds.Messages
-
-o.Repeat: Resources.Repeat
-	ResGen Repeat o.Repeat Resources.Repeat Resources.BootCmds.Repeat
-
-Resources.Repeat: o.repeatcmd ${OSLIB} ${STUBS}
-	${LINK} -output Resources.Repeat o.repeatcmd ${OSLIB} ${STUBS}
-
-o.repeatcmd: c.repeatcmd
-	${CC} ${THROWBACK} -depend !Depend -c -ff c.repeatcmd
-
-debug.trace: h.hostfs
-
-#General rules
-.SUFFIXES:   .cmhg .c .debug .o .asm .def
-.c.o:;       ${CC} ${THROWBACK} -depend !Depend -c ${ZM} -ff $<
-.asm.o:;     ${OBJASM} -stamp -quit $< $@
-.asm.debug:; ${OBJASM} -pd "TRACE SETL {TRUE}" -pd "STANDALONE SETL {TRUE}" -stamp -quit $< $@
-.c.debug:;   ${CC} ${THROWBACK} -depend !Depend -c ${ZM} -ff -DTRACE=1 -DSTANDALONE -o $@ $<
-.cmhg.o:;    ${CMHG} $< $@
-.c.s:;       ${CC} ${THROWBACK} -depend !Depend -s ${ZM} -ff $<
-.def.o:;     DefMod -l -o l.$* < $<
-	     LibFile -c -o $@ -via ViaFile
-	     Wipe l.$* ~C~FR~V
-.def.h:;     DefMod -h < $< > $@
-.def.s:;     DefMod -s < $< > $@
-
-# Dynamic dependencies:
diff --git a/SetDebug,feb b/SetDebug,feb
deleted file mode 100644
index fc7b50bf79039c68c0474c1448c2471d764d263f..0000000000000000000000000000000000000000
--- a/SetDebug,feb
+++ /dev/null
@@ -1,16 +0,0 @@
-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-SetType <Obey$Dir>.Test DebImage
-Set ColourPicker$Path SCSI::Doves.$.Medusa.Picker.Resources.
diff --git a/ViaFile b/ViaFile
deleted file mode 100644
index 6b92d2a966acb672d5f8523c617f320aca11176b..0000000000000000000000000000000000000000
--- a/ViaFile
+++ /dev/null
@@ -1,6 +0,0 @@
-l.hostfs.0x40100x.o.000
-l.hostfs.0x40100.o.000
-l.hostfs.0x40100x.o.001
-l.hostfs.0x40100.o.001
-l.hostfs.0x40100x.o.002
-l.hostfs.0x40100.o.002