some linkfixing (not done), testwriting (not done), and file renames (important)
one more rename