Changed polls app structure