The pile of symlinks we have holding this together is fragile and falls over if you look at it wrong. This needs cleanup.
Specifically we're looking at symlinks to symlinks. Also symlinks that don't need to be symlinks (they're only used in one place so can just be directly used)