Further reorganisation -BROKEN
Merge branch 'aidan_enhance_reorganize' of https://github.com/ConfuddledPenguin/SimpleShell into aidan_enhance_reorganize