Move rename so redirect doesn't break it, closes #18