Reorganized Input Module a bit. 

Signed-off-by: New-Guy <Kenneth.E.Sills@Gmail.com>