Clean-up sensor detection and group data by sensor type
Update dist files