Merge "Refactor input system into its own service."