Adds Keyboard input class and tidies Mouse and Time