Revert "Revert "folder app""

This reverts commit 0ca220fc39115de63e2cc53ed44df9026e005bb0.