[WIP] [Uploadable] Refactoring uploadable

This PR is not yet ready.

Fixes: #780.
Evolution of: #779