Remove Zim from floating class
Add zim to LOG workspace
Merge branch 'fea/shift_zim_to_LOG'