diff --git a/apps/clock-analog-icon.js b/apps/aclock/clock-analog-icon.js
similarity index 100%
rename from apps/clock-analog-icon.js
rename to apps/aclock/clock-analog-icon.js
diff --git a/apps/clock-analog.js b/apps/aclock/clock-analog.js
similarity index 100%
rename from apps/clock-analog.js
rename to apps/aclock/clock-analog.js
diff --git a/apps/clock-analog.json b/apps/aclock/clock-analog.json
similarity index 100%
rename from apps/clock-analog.json
rename to apps/aclock/clock-analog.json
diff --git a/apps/clock-analog.png b/apps/aclock/clock-analog.png
similarity index 100%
rename from apps/clock-analog.png
rename to apps/aclock/clock-analog.png
diff --git a/apps/animals-camel.js b/apps/animals/animals-camel.js
similarity index 100%
rename from apps/animals-camel.js
rename to apps/animals/animals-camel.js
diff --git a/apps/animals-duck.js b/apps/animals/animals-duck.js
similarity index 100%
rename from apps/animals-duck.js
rename to apps/animals/animals-duck.js
diff --git a/apps/animals-fox.js b/apps/animals/animals-fox.js
similarity index 100%
rename from apps/animals-fox.js
rename to apps/animals/animals-fox.js
diff --git a/apps/animals-icon.js b/apps/animals/animals-icon.js
similarity index 100%
rename from apps/animals-icon.js
rename to apps/animals/animals-icon.js
diff --git a/apps/animals-mouse.js b/apps/animals/animals-mouse.js
similarity index 100%
rename from apps/animals-mouse.js
rename to apps/animals/animals-mouse.js
diff --git a/apps/animals-pig.js b/apps/animals/animals-pig.js
similarity index 100%
rename from apps/animals-pig.js
rename to apps/animals/animals-pig.js
diff --git a/apps/animals-sheep.js b/apps/animals/animals-sheep.js
similarity index 100%
rename from apps/animals-sheep.js
rename to apps/animals/animals-sheep.js
diff --git a/apps/animals-snake.js b/apps/animals/animals-snake.js
similarity index 100%
rename from apps/animals-snake.js
rename to apps/animals/animals-snake.js
diff --git a/apps/animals-swan.js b/apps/animals/animals-swan.js
similarity index 100%
rename from apps/animals-swan.js
rename to apps/animals/animals-swan.js
diff --git a/apps/animals.js b/apps/animals/animals.js
similarity index 100%
rename from apps/animals.js
rename to apps/animals/animals.js
diff --git a/apps/animals.json b/apps/animals/animals.json
similarity index 100%
rename from apps/animals.json
rename to apps/animals/animals.json
diff --git a/apps/animals.png b/apps/animals/animals.png
similarity index 100%
rename from apps/animals.png
rename to apps/animals/animals.png
diff --git a/apps/asteroids-icon.js b/apps/astroid/asteroids-icon.js
similarity index 100%
rename from apps/asteroids-icon.js
rename to apps/astroid/asteroids-icon.js
diff --git a/apps/asteroids.js b/apps/astroid/asteroids.js
similarity index 100%
rename from apps/asteroids.js
rename to apps/astroid/asteroids.js
diff --git a/apps/asteroids.json b/apps/astroid/asteroids.json
similarity index 100%
rename from apps/asteroids.json
rename to apps/astroid/asteroids.json
diff --git a/apps/asteroids.png b/apps/astroid/asteroids.png
similarity index 100%
rename from apps/asteroids.png
rename to apps/astroid/asteroids.png
diff --git a/apps/clock-binary-icon.js b/apps/bclock/clock-binary-icon.js
similarity index 100%
rename from apps/clock-binary-icon.js
rename to apps/bclock/clock-binary-icon.js
diff --git a/apps/clock-binary.js b/apps/bclock/clock-binary.js
similarity index 100%
rename from apps/clock-binary.js
rename to apps/bclock/clock-binary.js
diff --git a/apps/clock-binary.json b/apps/bclock/clock-binary.json
similarity index 100%
rename from apps/clock-binary.json
rename to apps/bclock/clock-binary.json
diff --git a/apps/clock-binary.png b/apps/bclock/clock-binary.png
similarity index 100%
rename from apps/clock-binary.png
rename to apps/bclock/clock-binary.png
diff --git a/apps/beercompass.html b/apps/beer/beercompass.html
similarity index 100%
rename from apps/beercompass.html
rename to apps/beer/beercompass.html
diff --git a/apps/beercompass.png b/apps/beer/beercompass.png
similarity index 100%
rename from apps/beercompass.png
rename to apps/beer/beercompass.png
diff --git a/apps/blescan-icon.js b/apps/blescan/blescan-icon.js
similarity index 100%
rename from apps/blescan-icon.js
rename to apps/blescan/blescan-icon.js
diff --git a/apps/blescan.js b/apps/blescan/blescan.js
similarity index 100%
rename from apps/blescan.js
rename to apps/blescan/blescan.js
diff --git a/apps/blescan.json b/apps/blescan/blescan.json
similarity index 100%
rename from apps/blescan.json
rename to apps/blescan/blescan.json
diff --git a/apps/blescan.png b/apps/blescan/blescan.png
similarity index 100%
rename from apps/blescan.png
rename to apps/blescan/blescan.png
diff --git a/apps/clock-blob-icon.js b/apps/blobclk/clock-blob-icon.js
similarity index 100%
rename from apps/clock-blob-icon.js
rename to apps/blobclk/clock-blob-icon.js
diff --git a/apps/clock-blob.js b/apps/blobclk/clock-blob.js
similarity index 100%
rename from apps/clock-blob.js
rename to apps/blobclk/clock-blob.js
diff --git a/apps/clock-blob.json b/apps/blobclk/clock-blob.json
similarity index 100%
rename from apps/clock-blob.json
rename to apps/blobclk/clock-blob.json
diff --git a/apps/clock-blob.png b/apps/blobclk/clock-blob.png
similarity index 100%
rename from apps/clock-blob.png
rename to apps/blobclk/clock-blob.png
diff --git a/apps/bootloader.js b/apps/boot/bootloader.js
similarity index 100%
rename from apps/bootloader.js
rename to apps/boot/bootloader.js
diff --git a/apps/bootloader.png b/apps/boot/bootloader.png
similarity index 100%
rename from apps/bootloader.png
rename to apps/boot/bootloader.png
diff --git a/apps/click-master-icon.js b/apps/clickms/click-master-icon.js
similarity index 100%
rename from apps/click-master-icon.js
rename to apps/clickms/click-master-icon.js
diff --git a/apps/click-master.js b/apps/clickms/click-master.js
similarity index 100%
rename from apps/click-master.js
rename to apps/clickms/click-master.js
diff --git a/apps/click-master.json b/apps/clickms/click-master.json
similarity index 100%
rename from apps/click-master.json
rename to apps/clickms/click-master.json
diff --git a/apps/click-master.png b/apps/clickms/click-master.png
similarity index 100%
rename from apps/click-master.png
rename to apps/clickms/click-master.png
diff --git a/apps/clock-tris-high b/apps/clotris/clock-tris-high
similarity index 100%
rename from apps/clock-tris-high
rename to apps/clotris/clock-tris-high
diff --git a/apps/clock-tris-icon.js b/apps/clotris/clock-tris-icon.js
similarity index 100%
rename from apps/clock-tris-icon.js
rename to apps/clotris/clock-tris-icon.js
diff --git a/apps/clock-tris.js b/apps/clotris/clock-tris.js
similarity index 100%
rename from apps/clock-tris.js
rename to apps/clotris/clock-tris.js
diff --git a/apps/clock-tris.json b/apps/clotris/clock-tris.json
similarity index 100%
rename from apps/clock-tris.json
rename to apps/clotris/clock-tris.json
diff --git a/apps/clock-tris.png b/apps/clotris/clock-tris.png
similarity index 100%
rename from apps/clock-tris.png
rename to apps/clotris/clock-tris.png
diff --git a/apps/compass-icon.js b/apps/compass/compass-icon.js
similarity index 100%
rename from apps/compass-icon.js
rename to apps/compass/compass-icon.js
diff --git a/apps/compass.js b/apps/compass/compass.js
similarity index 100%
rename from apps/compass.js
rename to apps/compass/compass.js
diff --git a/apps/compass.json b/apps/compass/compass.json
similarity index 100%
rename from apps/compass.json
rename to apps/compass/compass.json
diff --git a/apps/compass.png b/apps/compass/compass.png
similarity index 100%
rename from apps/compass.png
rename to apps/compass/compass.png
diff --git a/apps/files-icon.js b/apps/files/files-icon.js
similarity index 100%
rename from apps/files-icon.js
rename to apps/files/files-icon.js
diff --git a/apps/files.js b/apps/files/files.js
similarity index 100%
rename from apps/files.js
rename to apps/files/files.js
diff --git a/apps/files.json b/apps/files/files.json
similarity index 100%
rename from apps/files.json
rename to apps/files/files.json
diff --git a/apps/files.png b/apps/files/files.png
similarity index 100%
rename from apps/files.png
rename to apps/files/files.png
diff --git a/apps/nceu-funrun-icon.js b/apps/funrun5/nceu-funrun-icon.js
similarity index 100%
rename from apps/nceu-funrun-icon.js
rename to apps/funrun5/nceu-funrun-icon.js
diff --git a/apps/nceu-funrun.js b/apps/funrun5/nceu-funrun.js
similarity index 100%
rename from apps/nceu-funrun.js
rename to apps/funrun5/nceu-funrun.js
diff --git a/apps/nceu-funrun.json b/apps/funrun5/nceu-funrun.json
similarity index 100%
rename from apps/nceu-funrun.json
rename to apps/funrun5/nceu-funrun.json
diff --git a/apps/nceu-funrun.png b/apps/funrun5/nceu-funrun.png
similarity index 100%
rename from apps/nceu-funrun.png
rename to apps/funrun5/nceu-funrun.png
diff --git a/apps/gesture-icon.js b/apps/gesture/gesture-icon.js
similarity index 100%
rename from apps/gesture-icon.js
rename to apps/gesture/gesture-icon.js
diff --git a/apps/gesture-tfmodel.js b/apps/gesture/gesture-tfmodel.js
similarity index 100%
rename from apps/gesture-tfmodel.js
rename to apps/gesture/gesture-tfmodel.js
diff --git a/apps/gesture-tfnames.js b/apps/gesture/gesture-tfnames.js
similarity index 100%
rename from apps/gesture-tfnames.js
rename to apps/gesture/gesture-tfnames.js
diff --git a/apps/gesture.js b/apps/gesture/gesture.js
similarity index 100%
rename from apps/gesture.js
rename to apps/gesture/gesture.js
diff --git a/apps/gesture.json b/apps/gesture/gesture.json
similarity index 100%
rename from apps/gesture.json
rename to apps/gesture/gesture.json
diff --git a/apps/gesture.png b/apps/gesture/gesture.png
similarity index 100%
rename from apps/gesture.png
rename to apps/gesture/gesture.png
diff --git a/apps/gps-info-icon.js b/apps/gpsinfo/gps-info-icon.js
similarity index 100%
rename from apps/gps-info-icon.js
rename to apps/gpsinfo/gps-info-icon.js
diff --git a/apps/gps-info.js b/apps/gpsinfo/gps-info.js
similarity index 100%
rename from apps/gps-info.js
rename to apps/gpsinfo/gps-info.js
diff --git a/apps/gps-info.json b/apps/gpsinfo/gps-info.json
similarity index 100%
rename from apps/gps-info.json
rename to apps/gpsinfo/gps-info.json
diff --git a/apps/gps-info.png b/apps/gpsinfo/gps-info.png
similarity index 100%
rename from apps/gps-info.png
rename to apps/gpsinfo/gps-info.png
diff --git a/apps/gpstime-icon.js b/apps/gpstime/gpstime-icon.js
similarity index 100%
rename from apps/gpstime-icon.js
rename to apps/gpstime/gpstime-icon.js
diff --git a/apps/gpstime.js b/apps/gpstime/gpstime.js
similarity index 100%
rename from apps/gpstime.js
rename to apps/gpstime/gpstime.js
diff --git a/apps/gpstime.json b/apps/gpstime/gpstime.json
similarity index 100%
rename from apps/gpstime.json
rename to apps/gpstime/gpstime.json
diff --git a/apps/gpstime.png b/apps/gpstime/gpstime.png
similarity index 100%
rename from apps/gpstime.png
rename to apps/gpstime/gpstime.png
diff --git a/apps/hid-binary-keyboard-icon.js b/apps/hidbkbd/hid-binary-keyboard-icon.js
similarity index 100%
rename from apps/hid-binary-keyboard-icon.js
rename to apps/hidbkbd/hid-binary-keyboard-icon.js
diff --git a/apps/hid-binary-keyboard.js b/apps/hidbkbd/hid-binary-keyboard.js
similarity index 100%
rename from apps/hid-binary-keyboard.js
rename to apps/hidbkbd/hid-binary-keyboard.js
diff --git a/apps/hid-binary-keyboard.json b/apps/hidbkbd/hid-binary-keyboard.json
similarity index 100%
rename from apps/hid-binary-keyboard.json
rename to apps/hidbkbd/hid-binary-keyboard.json
diff --git a/apps/hid-binary-keyboard.png b/apps/hidbkbd/hid-binary-keyboard.png
similarity index 100%
rename from apps/hid-binary-keyboard.png
rename to apps/hidbkbd/hid-binary-keyboard.png
diff --git a/apps/hid-keyboard-icon.js b/apps/hidkbd/hid-keyboard-icon.js
similarity index 100%
rename from apps/hid-keyboard-icon.js
rename to apps/hidkbd/hid-keyboard-icon.js
diff --git a/apps/hid-keyboard.js b/apps/hidkbd/hid-keyboard.js
similarity index 100%
rename from apps/hid-keyboard.js
rename to apps/hidkbd/hid-keyboard.js
diff --git a/apps/hid-keyboard.json b/apps/hidkbd/hid-keyboard.json
similarity index 100%
rename from apps/hid-keyboard.json
rename to apps/hidkbd/hid-keyboard.json
diff --git a/apps/hid-keyboard.min.js b/apps/hidkbd/hid-keyboard.min.js
similarity index 100%
rename from apps/hid-keyboard.min.js
rename to apps/hidkbd/hid-keyboard.min.js
diff --git a/apps/hid-keyboard.png b/apps/hidkbd/hid-keyboard.png
similarity index 100%
rename from apps/hid-keyboard.png
rename to apps/hidkbd/hid-keyboard.png
diff --git a/apps/hid-music-icon.js b/apps/hidmsic/hid-music-icon.js
similarity index 100%
rename from apps/hid-music-icon.js
rename to apps/hidmsic/hid-music-icon.js
diff --git a/apps/hid-music.js b/apps/hidmsic/hid-music.js
similarity index 100%
rename from apps/hid-music.js
rename to apps/hidmsic/hid-music.js
diff --git a/apps/hid-music.json b/apps/hidmsic/hid-music.json
similarity index 100%
rename from apps/hid-music.json
rename to apps/hidmsic/hid-music.json
diff --git a/apps/hid-music.png b/apps/hidmsic/hid-music.png
similarity index 100%
rename from apps/hid-music.png
rename to apps/hidmsic/hid-music.png
diff --git a/apps/horse-race-icon.js b/apps/horsey/horse-race-icon.js
similarity index 100%
rename from apps/horse-race-icon.js
rename to apps/horsey/horse-race-icon.js
diff --git a/apps/horse-race.js b/apps/horsey/horse-race.js
similarity index 100%
rename from apps/horse-race.js
rename to apps/horsey/horse-race.js
diff --git a/apps/horse-race.json b/apps/horsey/horse-race.json
similarity index 100%
rename from apps/horse-race.json
rename to apps/horsey/horse-race.json
diff --git a/apps/horse-race.png b/apps/horsey/horse-race.png
similarity index 100%
rename from apps/horse-race.png
rename to apps/horsey/horse-race.png
diff --git a/apps/hypno-rings-icon.js b/apps/hrings/hypno-rings-icon.js
similarity index 100%
rename from apps/hypno-rings-icon.js
rename to apps/hrings/hypno-rings-icon.js
diff --git a/apps/hypno-rings.js b/apps/hrings/hypno-rings.js
similarity index 100%
rename from apps/hypno-rings.js
rename to apps/hrings/hypno-rings.js
diff --git a/apps/hypno-rings.json b/apps/hrings/hypno-rings.json
similarity index 100%
rename from apps/hypno-rings.json
rename to apps/hrings/hypno-rings.json
diff --git a/apps/hypno-rings.png b/apps/hrings/hypno-rings.png
similarity index 100%
rename from apps/hypno-rings.png
rename to apps/hrings/hypno-rings.png
diff --git a/apps/heartrate-icon.js b/apps/hrm/heartrate-icon.js
similarity index 100%
rename from apps/heartrate-icon.js
rename to apps/hrm/heartrate-icon.js
diff --git a/apps/heartrate.js b/apps/hrm/heartrate.js
similarity index 100%
rename from apps/heartrate.js
rename to apps/hrm/heartrate.js
diff --git a/apps/heartrate.json b/apps/hrm/heartrate.json
similarity index 100%
rename from apps/heartrate.json
rename to apps/hrm/heartrate.json
diff --git a/apps/heartrate.png b/apps/hrm/heartrate.png
similarity index 100%
rename from apps/heartrate.png
rename to apps/hrm/heartrate.png
diff --git a/apps/jbells-icon.js b/apps/jbells/jbells-icon.js
similarity index 100%
rename from apps/jbells-icon.js
rename to apps/jbells/jbells-icon.js
diff --git a/apps/jbells.js b/apps/jbells/jbells.js
similarity index 100%
rename from apps/jbells.js
rename to apps/jbells/jbells.js
diff --git a/apps/jbells.json b/apps/jbells/jbells.json
similarity index 100%
rename from apps/jbells.json
rename to apps/jbells/jbells.json
diff --git a/apps/jbells.png b/apps/jbells/jbells.png
similarity index 100%
rename from apps/jbells.png
rename to apps/jbells/jbells.png
diff --git a/apps/clock-morphing-icon.js b/apps/mclock/clock-morphing-icon.js
similarity index 100%
rename from apps/clock-morphing-icon.js
rename to apps/mclock/clock-morphing-icon.js
diff --git a/apps/clock-morphing.js b/apps/mclock/clock-morphing.js
similarity index 100%
rename from apps/clock-morphing.js
rename to apps/mclock/clock-morphing.js
diff --git a/apps/clock-morphing.json b/apps/mclock/clock-morphing.json
similarity index 100%
rename from apps/clock-morphing.json
rename to apps/mclock/clock-morphing.json
diff --git a/apps/clock-morphing.png b/apps/mclock/clock-morphing.png
similarity index 100%
rename from apps/clock-morphing.png
rename to apps/mclock/clock-morphing.png
diff --git a/apps/clock-mixed-icon.js b/apps/miclock/clock-mixed-icon.js
similarity index 100%
rename from apps/clock-mixed-icon.js
rename to apps/miclock/clock-mixed-icon.js
diff --git a/apps/clock-mixed.js b/apps/miclock/clock-mixed.js
similarity index 100%
rename from apps/clock-mixed.js
rename to apps/miclock/clock-mixed.js
diff --git a/apps/clock-mixed.json b/apps/miclock/clock-mixed.json
similarity index 100%
rename from apps/clock-mixed.json
rename to apps/miclock/clock-mixed.json
diff --git a/apps/clock-mixed.png b/apps/miclock/clock-mixed.png
similarity index 100%
rename from apps/clock-mixed.png
rename to apps/miclock/clock-mixed.png
diff --git a/apps/manic-monday-icon.js b/apps/mmonday/manic-monday-icon.js
similarity index 100%
rename from apps/manic-monday-icon.js
rename to apps/mmonday/manic-monday-icon.js
diff --git a/apps/manic-monday-icon.png b/apps/mmonday/manic-monday-icon.png
similarity index 100%
rename from apps/manic-monday-icon.png
rename to apps/mmonday/manic-monday-icon.png
diff --git a/apps/manic-monday.js b/apps/mmonday/manic-monday.js
similarity index 100%
rename from apps/manic-monday.js
rename to apps/mmonday/manic-monday.js
diff --git a/apps/manic-monday.json b/apps/mmonday/manic-monday.json
similarity index 100%
rename from apps/manic-monday.json
rename to apps/mmonday/manic-monday.json
diff --git a/apps/morse-code-icon.js b/apps/morse/morse-code-icon.js
similarity index 100%
rename from apps/morse-code-icon.js
rename to apps/morse/morse-code-icon.js
diff --git a/apps/morse-code.js b/apps/morse/morse-code.js
similarity index 100%
rename from apps/morse-code.js
rename to apps/morse/morse-code.js
diff --git a/apps/morse-code.json b/apps/morse/morse-code.json
similarity index 100%
rename from apps/morse-code.json
rename to apps/morse/morse-code.json
diff --git a/apps/morse-code.png b/apps/morse/morse-code.png
similarity index 100%
rename from apps/morse-code.png
rename to apps/morse/morse-code.png
diff --git a/apps/nceu-widget.js b/apps/nceuwid/nceu-widget.js
similarity index 100%
rename from apps/nceu-widget.js
rename to apps/nceuwid/nceu-widget.js
diff --git a/apps/nceu-widget.json b/apps/nceuwid/nceu-widget.json
similarity index 100%
rename from apps/nceu-widget.json
rename to apps/nceuwid/nceu-widget.json
diff --git a/apps/nceu-widget.png b/apps/nceuwid/nceu-widget.png
similarity index 100%
rename from apps/nceu-widget.png
rename to apps/nceuwid/nceu-widget.png
diff --git a/apps/openlocation-icon.js b/apps/openloc/openlocation-icon.js
similarity index 100%
rename from apps/openlocation-icon.js
rename to apps/openloc/openlocation-icon.js
diff --git a/apps/openlocation.js b/apps/openloc/openlocation.js
similarity index 100%
rename from apps/openlocation.js
rename to apps/openloc/openlocation.js
diff --git a/apps/openlocation.json b/apps/openloc/openlocation.json
similarity index 100%
rename from apps/openlocation.json
rename to apps/openloc/openlocation.json
diff --git a/apps/openlocation.png b/apps/openloc/openlocation.png
similarity index 100%
rename from apps/openlocation.png
rename to apps/openloc/openlocation.png
diff --git a/apps/party-parrot-icon.js b/apps/pparrot/party-parrot-icon.js
similarity index 100%
rename from apps/party-parrot-icon.js
rename to apps/pparrot/party-parrot-icon.js
diff --git a/apps/party-parrot.js b/apps/pparrot/party-parrot.js
similarity index 100%
rename from apps/party-parrot.js
rename to apps/pparrot/party-parrot.js
diff --git a/apps/party-parrot.json b/apps/pparrot/party-parrot.json
similarity index 100%
rename from apps/party-parrot.json
rename to apps/pparrot/party-parrot.json
diff --git a/apps/party-parrot.png b/apps/pparrot/party-parrot.png
similarity index 100%
rename from apps/party-parrot.png
rename to apps/pparrot/party-parrot.png
diff --git a/apps/promodoro-icon.js b/apps/promodo/promodoro-icon.js
similarity index 100%
rename from apps/promodoro-icon.js
rename to apps/promodo/promodoro-icon.js
diff --git a/apps/promodoro.js b/apps/promodo/promodoro.js
similarity index 100%
rename from apps/promodoro.js
rename to apps/promodo/promodoro.js
diff --git a/apps/promodoro.json b/apps/promodo/promodoro.json
similarity index 100%
rename from apps/promodoro.json
rename to apps/promodo/promodoro.json
diff --git a/apps/promodoro.png b/apps/promodo/promodoro.png
similarity index 100%
rename from apps/promodoro.png
rename to apps/promodo/promodoro.png
diff --git a/apps/qrcode.html b/apps/qrcode/qrcode.html
similarity index 100%
rename from apps/qrcode.html
rename to apps/qrcode/qrcode.html
diff --git a/apps/qrcode.png b/apps/qrcode/qrcode.png
similarity index 100%
rename from apps/qrcode.png
rename to apps/qrcode/qrcode.png
diff --git a/apps/route.html b/apps/route/route.html
similarity index 100%
rename from apps/route.html
rename to apps/route/route.html
diff --git a/apps/route.png b/apps/route/route.png
similarity index 100%
rename from apps/route.png
rename to apps/route/route.png
diff --git a/apps/widget-battery.js b/apps/sbat/widget-battery.js
similarity index 100%
rename from apps/widget-battery.js
rename to apps/sbat/widget-battery.js
diff --git a/apps/widget-battery.json b/apps/sbat/widget-battery.json
similarity index 100%
rename from apps/widget-battery.json
rename to apps/sbat/widget-battery.json
diff --git a/apps/widget-battery.png b/apps/sbat/widget-battery.png
similarity index 100%
rename from apps/widget-battery.png
rename to apps/sbat/widget-battery.png
diff --git a/apps/widget-bluetooth.js b/apps/sbt/widget-bluetooth.js
similarity index 100%
rename from apps/widget-bluetooth.js
rename to apps/sbt/widget-bluetooth.js
diff --git a/apps/widget-bluetooth.json b/apps/sbt/widget-bluetooth.json
similarity index 100%
rename from apps/widget-bluetooth.json
rename to apps/sbt/widget-bluetooth.json
diff --git a/apps/widget-bluetooth.png b/apps/sbt/widget-bluetooth.png
similarity index 100%
rename from apps/widget-bluetooth.png
rename to apps/sbt/widget-bluetooth.png
diff --git a/apps/clock-simple-icon.js b/apps/sclock/clock-simple-icon.js
similarity index 100%
rename from apps/clock-simple-icon.js
rename to apps/sclock/clock-simple-icon.js
diff --git a/apps/clock-simple.js b/apps/sclock/clock-simple.js
similarity index 100%
rename from apps/clock-simple.js
rename to apps/sclock/clock-simple.js
diff --git a/apps/clock-simple.json b/apps/sclock/clock-simple.json
similarity index 100%
rename from apps/clock-simple.json
rename to apps/sclock/clock-simple.json
diff --git a/apps/clock-simple.png b/apps/sclock/clock-simple.png
similarity index 100%
rename from apps/clock-simple.png
rename to apps/sclock/clock-simple.png
diff --git a/apps/show-color-icon.js b/apps/scolor/show-color-icon.js
similarity index 100%
rename from apps/show-color-icon.js
rename to apps/scolor/show-color-icon.js
diff --git a/apps/show-color.js b/apps/scolor/show-color.js
similarity index 100%
rename from apps/show-color.js
rename to apps/scolor/show-color.js
diff --git a/apps/show-color.json b/apps/scolor/show-color.json
similarity index 100%
rename from apps/show-color.json
rename to apps/scolor/show-color.json
diff --git a/apps/show-color.png b/apps/scolor/show-color.png
similarity index 100%
rename from apps/show-color.png
rename to apps/scolor/show-color.png
diff --git a/apps/settings-default.json b/apps/setting/settings-default.json
similarity index 100%
rename from apps/settings-default.json
rename to apps/setting/settings-default.json
diff --git a/apps/settings-icon.js b/apps/setting/settings-icon.js
similarity index 100%
rename from apps/settings-icon.js
rename to apps/setting/settings-icon.js
diff --git a/apps/settings-init.js b/apps/setting/settings-init.js
similarity index 100%
rename from apps/settings-init.js
rename to apps/setting/settings-init.js
diff --git a/apps/settings.js b/apps/setting/settings.js
similarity index 100%
rename from apps/settings.js
rename to apps/setting/settings.js
diff --git a/apps/settings.json b/apps/setting/settings.json
similarity index 100%
rename from apps/settings.json
rename to apps/setting/settings.json
diff --git a/apps/settings.png b/apps/setting/settings.png
similarity index 100%
rename from apps/settings.png
rename to apps/setting/settings.png
diff --git a/apps/spiritlevel-icon.js b/apps/slevel/spiritlevel-icon.js
similarity index 100%
rename from apps/spiritlevel-icon.js
rename to apps/slevel/spiritlevel-icon.js
diff --git a/apps/spiritlevel.js b/apps/slevel/spiritlevel.js
similarity index 100%
rename from apps/spiritlevel.js
rename to apps/slevel/spiritlevel.js
diff --git a/apps/spiritlevel.json b/apps/slevel/spiritlevel.json
similarity index 100%
rename from apps/spiritlevel.json
rename to apps/slevel/spiritlevel.json
diff --git a/apps/spiritlevel.png b/apps/slevel/spiritlevel.png
similarity index 100%
rename from apps/spiritlevel.png
rename to apps/slevel/spiritlevel.png
diff --git a/apps/speedo-icon.js b/apps/speedo/speedo-icon.js
similarity index 100%
rename from apps/speedo-icon.js
rename to apps/speedo/speedo-icon.js
diff --git a/apps/speedo.js b/apps/speedo/speedo.js
similarity index 100%
rename from apps/speedo.js
rename to apps/speedo/speedo.js
diff --git a/apps/speedo.json b/apps/speedo/speedo.json
similarity index 100%
rename from apps/speedo.json
rename to apps/speedo/speedo.json
diff --git a/apps/speedo.png b/apps/speedo/speedo.png
similarity index 100%
rename from apps/speedo.png
rename to apps/speedo/speedo.png
diff --git a/apps/start-bangle.js b/apps/start/start-bangle.js
similarity index 100%
rename from apps/start-bangle.js
rename to apps/start/start-bangle.js
diff --git a/apps/start-icon.js b/apps/start/start-icon.js
similarity index 100%
rename from apps/start-icon.js
rename to apps/start/start-icon.js
diff --git a/apps/start-nceu.js b/apps/start/start-nceu.js
similarity index 100%
rename from apps/start-nceu.js
rename to apps/start/start-nceu.js
diff --git a/apps/start-nfr.js b/apps/start/start-nfr.js
similarity index 100%
rename from apps/start-nfr.js
rename to apps/start/start-nfr.js
diff --git a/apps/start-nodew.js b/apps/start/start-nodew.js
similarity index 100%
rename from apps/start-nodew.js
rename to apps/start/start-nodew.js
diff --git a/apps/start-tf.js b/apps/start/start-tf.js
similarity index 100%
rename from apps/start-tf.js
rename to apps/start/start-tf.js
diff --git a/apps/start.js b/apps/start/start.js
similarity index 100%
rename from apps/start.js
rename to apps/start/start.js
diff --git a/apps/start.json b/apps/start/start.json
similarity index 100%
rename from apps/start.json
rename to apps/start/start.json
diff --git a/apps/start.png b/apps/start/start.png
similarity index 100%
rename from apps/start.png
rename to apps/start/start.png
diff --git a/apps/stopwatch-icon.js b/apps/swatch/stopwatch-icon.js
similarity index 100%
rename from apps/stopwatch-icon.js
rename to apps/swatch/stopwatch-icon.js
diff --git a/apps/stopwatch.js b/apps/swatch/stopwatch.js
similarity index 100%
rename from apps/stopwatch.js
rename to apps/swatch/stopwatch.js
diff --git a/apps/stopwatch.json b/apps/swatch/stopwatch.json
similarity index 100%
rename from apps/stopwatch.json
rename to apps/swatch/stopwatch.json
diff --git a/apps/stopwatch.png b/apps/swatch/stopwatch.png
similarity index 100%
rename from apps/stopwatch.png
rename to apps/swatch/stopwatch.png
diff --git a/apps/trex-icon.js b/apps/trex/trex-icon.js
similarity index 100%
rename from apps/trex-icon.js
rename to apps/trex/trex-icon.js
diff --git a/apps/trex.js b/apps/trex/trex.js
similarity index 100%
rename from apps/trex.js
rename to apps/trex/trex.js
diff --git a/apps/trex.json b/apps/trex/trex.json
similarity index 100%
rename from apps/trex.json
rename to apps/trex/trex.json
diff --git a/apps/trex.png b/apps/trex/trex.png
similarity index 100%
rename from apps/trex.png
rename to apps/trex/trex.png
diff --git a/apps/clock-word-icon.js b/apps/wclock/clock-word-icon.js
similarity index 100%
rename from apps/clock-word-icon.js
rename to apps/wclock/clock-word-icon.js
diff --git a/apps/clock-word.js b/apps/wclock/clock-word.js
similarity index 100%
rename from apps/clock-word.js
rename to apps/wclock/clock-word.js
diff --git a/apps/clock-word.json b/apps/wclock/clock-word.json
similarity index 100%
rename from apps/clock-word.json
rename to apps/wclock/clock-word.json
diff --git a/apps/clock-word.png b/apps/wclock/clock-word.png
similarity index 100%
rename from apps/clock-word.png
rename to apps/wclock/clock-word.png