Clean repo, rename files