Added missing file
Finished refactoring of controls