diff --git a/elf/APPS_BarcodeGenerator.elf b/apps/APPS_BarcodeGenerator.fap
similarity index 81%
rename from elf/APPS_BarcodeGenerator.elf
rename to apps/APPS_BarcodeGenerator.fap
index e90800ad..4b3d793a 100644
Binary files a/elf/APPS_BarcodeGenerator.elf and b/apps/APPS_BarcodeGenerator.fap differ
diff --git a/elf/APPS_BluetoothRemote.elf b/apps/APPS_BluetoothRemote.fap
similarity index 95%
rename from elf/APPS_BluetoothRemote.elf
rename to apps/APPS_BluetoothRemote.fap
index d697db07..4147c746 100644
Binary files a/elf/APPS_BluetoothRemote.elf and b/apps/APPS_BluetoothRemote.fap differ
diff --git a/elf/APPS_DolphinBackup.elf b/apps/APPS_DolphinBackup.fap
similarity index 74%
rename from elf/APPS_DolphinBackup.elf
rename to apps/APPS_DolphinBackup.fap
index ead78ce0..3183c489 100644
Binary files a/elf/APPS_DolphinBackup.elf and b/apps/APPS_DolphinBackup.fap differ
diff --git a/apps/APPS_DolphinRestorer.fap b/apps/APPS_DolphinRestorer.fap
new file mode 100644
index 00000000..8179817a
Binary files /dev/null and b/apps/APPS_DolphinRestorer.fap differ
diff --git a/elf/APPS_MouseJiggler.elf b/apps/APPS_MouseJiggler.fap
similarity index 72%
rename from elf/APPS_MouseJiggler.elf
rename to apps/APPS_MouseJiggler.fap
index f4904488..fb822620 100644
Binary files a/elf/APPS_MouseJiggler.elf and b/apps/APPS_MouseJiggler.fap differ
diff --git a/elf/APPS_MusicPlayer.elf b/apps/APPS_MusicPlayer.fap
similarity index 91%
rename from elf/APPS_MusicPlayer.elf
rename to apps/APPS_MusicPlayer.fap
index 6308389f..6ecec453 100644
Binary files a/elf/APPS_MusicPlayer.elf and b/apps/APPS_MusicPlayer.fap differ
diff --git a/elf/APPS_SentrySafe.elf b/apps/APPS_SentrySafe.fap
similarity index 77%
rename from elf/APPS_SentrySafe.elf
rename to apps/APPS_SentrySafe.fap
index 8508b2d1..da0f7cbc 100644
Binary files a/elf/APPS_SentrySafe.elf and b/apps/APPS_SentrySafe.fap differ
diff --git a/elf/APPS_SpectrumAnalyzer.elf b/apps/APPS_SpectrumAnalyzer.fap
similarity index 86%
rename from elf/APPS_SpectrumAnalyzer.elf
rename to apps/APPS_SpectrumAnalyzer.fap
index d6d1551f..de503880 100644
Binary files a/elf/APPS_SpectrumAnalyzer.elf and b/apps/APPS_SpectrumAnalyzer.fap differ
diff --git a/apps/APPS_TOTP.fap b/apps/APPS_TOTP.fap
new file mode 100644
index 00000000..f53afac0
Binary files /dev/null and b/apps/APPS_TOTP.fap differ
diff --git a/elf/APPS_WAVPlayer.elf b/apps/APPS_WAVPlayer.fap
similarity index 93%
rename from elf/APPS_WAVPlayer.elf
rename to apps/APPS_WAVPlayer.fap
index c1fdd7c3..a7bfdfa5 100644
Binary files a/elf/APPS_WAVPlayer.elf and b/apps/APPS_WAVPlayer.fap differ
diff --git a/apps/GAME_2048.fap b/apps/GAME_2048.fap
new file mode 100644
index 00000000..cfc2be57
Binary files /dev/null and b/apps/GAME_2048.fap differ
diff --git a/elf/GAME_Arkanoid.elf b/apps/GAME_Arkanoid.fap
similarity index 67%
rename from elf/GAME_Arkanoid.elf
rename to apps/GAME_Arkanoid.fap
index cd595bb0..5e8d7651 100644
Binary files a/elf/GAME_Arkanoid.elf and b/apps/GAME_Arkanoid.fap differ
diff --git a/elf/GAME_Dice.elf b/apps/GAME_Dice.fap
similarity index 89%
rename from elf/GAME_Dice.elf
rename to apps/GAME_Dice.fap
index e0544fdd..a97ca7e9 100644
Binary files a/elf/GAME_Dice.elf and b/apps/GAME_Dice.fap differ
diff --git a/apps/GAME_FlappyBird.fap b/apps/GAME_FlappyBird.fap
new file mode 100644
index 00000000..aa0d63c3
Binary files /dev/null and b/apps/GAME_FlappyBird.fap differ
diff --git a/apps/GAME_MandelbrotSet.fap b/apps/GAME_MandelbrotSet.fap
new file mode 100644
index 00000000..400a45f4
Binary files /dev/null and b/apps/GAME_MandelbrotSet.fap differ
diff --git a/apps/GAME_Snake.fap b/apps/GAME_Snake.fap
new file mode 100644
index 00000000..4160d20a
Binary files /dev/null and b/apps/GAME_Snake.fap differ
diff --git a/elf/GAME_TicTacToe.elf b/apps/GAME_TicTacToe.fap
similarity index 80%
rename from elf/GAME_TicTacToe.elf
rename to apps/GAME_TicTacToe.fap
index 34000275..8f686864 100644
Binary files a/elf/GAME_TicTacToe.elf and b/apps/GAME_TicTacToe.fap differ
diff --git a/elf/GAME_VideoPoker.elf b/apps/GAME_VideoPoker.fap
similarity index 92%
rename from elf/GAME_VideoPoker.elf
rename to apps/GAME_VideoPoker.fap
index 5cfa2fa1..63e115d3 100644
Binary files a/elf/GAME_VideoPoker.elf and b/apps/GAME_VideoPoker.fap differ
diff --git a/elf/INTAPP_Chess.elf b/apps/INTAPP_Chess.fap
similarity index 92%
rename from elf/INTAPP_Chess.elf
rename to apps/INTAPP_Chess.fap
index 27872f87..7a2d1075 100644
Binary files a/elf/INTAPP_Chess.elf and b/apps/INTAPP_Chess.fap differ
diff --git a/elf/INTAPP_Chip8.elf b/apps/INTAPP_Chip8.fap
similarity index 88%
rename from elf/INTAPP_Chip8.elf
rename to apps/INTAPP_Chip8.fap
index 9166841f..3203810f 100644
Binary files a/elf/INTAPP_Chip8.elf and b/apps/INTAPP_Chip8.fap differ
diff --git a/elf/INTAPP_GameOfLife.elf b/apps/INTAPP_GameOfLife.fap
similarity index 51%
rename from elf/INTAPP_GameOfLife.elf
rename to apps/INTAPP_GameOfLife.fap
index 76fc981d..102448b9 100644
Binary files a/elf/INTAPP_GameOfLife.elf and b/apps/INTAPP_GameOfLife.fap differ
diff --git a/elf/INTAPP_HIDAnalyzer.elf b/apps/INTAPP_HIDAnalyzer.fap
similarity index 79%
rename from elf/INTAPP_HIDAnalyzer.elf
rename to apps/INTAPP_HIDAnalyzer.fap
index 1895213a..9c8f8f25 100644
Binary files a/elf/INTAPP_HIDAnalyzer.elf and b/apps/INTAPP_HIDAnalyzer.fap differ
diff --git a/elf/INTAPP_MouseJacker.elf b/apps/INTAPP_MouseJacker.fap
similarity index 77%
rename from elf/INTAPP_MouseJacker.elf
rename to apps/INTAPP_MouseJacker.fap
index 87b34d03..a6780efa 100644
Binary files a/elf/INTAPP_MouseJacker.elf and b/apps/INTAPP_MouseJacker.fap differ
diff --git a/elf/INTAPP_NRFSniff.elf b/apps/INTAPP_NRFSniff.fap
similarity index 88%
rename from elf/INTAPP_NRFSniff.elf
rename to apps/INTAPP_NRFSniff.fap
index 1c18ca9e..959b9f1a 100644
Binary files a/elf/INTAPP_NRFSniff.elf and b/apps/INTAPP_NRFSniff.fap differ
diff --git a/elf/INTAPP_Picopass.elf b/apps/INTAPP_Picopass.fap
similarity index 96%
rename from elf/INTAPP_Picopass.elf
rename to apps/INTAPP_Picopass.fap
index 8b4c1809..e068e4e4 100644
Binary files a/elf/INTAPP_Picopass.elf and b/apps/INTAPP_Picopass.fap differ
diff --git a/elf/INTAPP_Raycast.elf b/apps/INTAPP_Raycast.fap
similarity index 87%
rename from elf/INTAPP_Raycast.elf
rename to apps/INTAPP_Raycast.fap
index ef9b2988..e2c82e41 100644
Binary files a/elf/INTAPP_Raycast.elf and b/apps/INTAPP_Raycast.fap differ
diff --git a/elf/INTAPP_Tanks.elf b/apps/INTAPP_Tanks.fap
similarity index 84%
rename from elf/INTAPP_Tanks.elf
rename to apps/INTAPP_Tanks.fap
index 5c1aff8f..7f0baeb4 100644
Binary files a/elf/INTAPP_Tanks.elf and b/apps/INTAPP_Tanks.fap differ
diff --git a/apps/INTAPP_Tetris.fap b/apps/INTAPP_Tetris.fap
new file mode 100644
index 00000000..c4c90259
Binary files /dev/null and b/apps/INTAPP_Tetris.fap differ
diff --git a/elf/INTAPP_TouchTunes.elf b/apps/INTAPP_TouchTunes.fap
similarity index 88%
rename from elf/INTAPP_TouchTunes.elf
rename to apps/INTAPP_TouchTunes.fap
index 21404140..6c2ad079 100644
Binary files a/elf/INTAPP_TouchTunes.elf and b/apps/INTAPP_TouchTunes.fap differ
diff --git a/elf/INTAPP_WiFiScanner.elf b/apps/INTAPP_WiFiScanner.fap
similarity index 92%
rename from elf/INTAPP_WiFiScanner.elf
rename to apps/INTAPP_WiFiScanner.fap
index 7060287b..e618a0e4 100644
Binary files a/elf/INTAPP_WiFiScanner.elf and b/apps/INTAPP_WiFiScanner.fap differ
diff --git a/elf/APPS_DolphinRestorer.elf b/elf/APPS_DolphinRestorer.elf
deleted file mode 100644
index 1f990195..00000000
Binary files a/elf/APPS_DolphinRestorer.elf and /dev/null differ
diff --git a/elf/GAME_2048.elf b/elf/GAME_2048.elf
deleted file mode 100644
index 1981dcc5..00000000
Binary files a/elf/GAME_2048.elf and /dev/null differ
diff --git a/elf/GAME_FlappyBird.elf b/elf/GAME_FlappyBird.elf
deleted file mode 100644
index 9499e224..00000000
Binary files a/elf/GAME_FlappyBird.elf and /dev/null differ
diff --git a/elf/GAME_MandelbrotSet.elf b/elf/GAME_MandelbrotSet.elf
deleted file mode 100644
index 8a7e7035..00000000
Binary files a/elf/GAME_MandelbrotSet.elf and /dev/null differ
diff --git a/elf/GAME_Snake.elf b/elf/GAME_Snake.elf
deleted file mode 100644
index af68a8c6..00000000
Binary files a/elf/GAME_Snake.elf and /dev/null differ
diff --git a/elf/INTAPP_Tetris.elf b/elf/INTAPP_Tetris.elf
deleted file mode 100644
index 6864940a..00000000
Binary files a/elf/INTAPP_Tetris.elf and /dev/null differ