renamed and updated depending files