refactoring of \Pimf\Util\Uploaded + unit tests