Update gulpfile, update tests, move top-level files to 'layout',