Extract interfces from Controllers
Desktop prototypes
Some changes