Tweak permalink structure, move category pages to match