Move Sensor into separate file
Move CLI to separate file