Put in core package and fixed names
Input appers for mouse and keyboard
Merge branch 'JoeMaster'