Make structure less nested
Fix app name