Restructure: Fix imports from master merge.