Fixed missing and deprecated files