Revert "Change app structure"

This reverts commit 0a76c4ede41b0734a2e347ca2bc2902d9adc9da3.