Revert "App & Layer"

This reverts commit b7f33ab694f4f1bf3ebe187f08e139b031e2513e.