Move some files around, relink