some renames
updates to new polls app structure
updates to Step 4
updates to Step 5
updates to Step 6