Refactored scaffold upload to scaffold create