Move file up in Input
Merge branch 'feature/input' into feature/controllers