Revert "fixing app structure"

This reverts commit e539c6e39e84914ab34950870b60cdb7666a922d.