Restructure device app bundle