Yes, trouble is the prefix dir messes with that. Need to setup requires config to not need the dir prefix and then this can be totally tidied up.