reorganized code to match lab instructions
reorganized code to match lab instructions

googlecodelabs/workbox-lab,googlecodelabs/workbox-indexeddb,googlecodelabs/amp-pwa-workbox,googlecodelabs/workbox-indexeddb,googlecodelabs/workbox-lab,googlecodelabs/amp-pwa-workbox