rename some files and remove old deps;