Fix imports and add missing files