Keys and Urls refactor
Upload file (incomplete)