Cleanup and organize libsensors