lots more filename and directory changes