Reorganize, add folder for sensors