Renamed classes again, fixed file uploaded bytes progress