Renamed files and removed print specific