Restructure of code to make it more consistent with other vNext apps