file structure cleanup and path updates in gulpfile