Fix repository locations
gendocs
Move regexes around