Rest files from Miha change to Async namespace