Abstracted Control into InputControl and ButtonControl
Reorganized packages