Refactored the upload module to get a more clean implementation