Fix missing imports: correct bad paths and typos
Fix more missing imports: correct bad paths and typos
Bug 3433: fixing frontend tools to work in master branch