Add shorcut to move window between screen
Refactoring and add tests