Moved temp storage location into storeage_path and fix bug with removing the file on complete