Even more moving stuff around
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev