Update dispatchers
Change contracts directory
Add request interface again
Fix calls
Update tests