Shift calibre to ETC workspace
Merge branch 'fea/move_calibre_to_etc'