re-organized Calvin's items to calvin-work2