[WIP] [Uploadable] Refactoring uploadable

This PR is not yet ready