There is still some nasty hardcoding of paths, but that can be tackled in future refactoring.