restructure to match organization of grunt build

Change-Id: I57f2f973b0191c195444c02b6749ec80954786cd