Moved inputs into separate files
Inputs clean-up

Refactored selectable/selection
Consistent API