ITB-1809 - PROJ-56: Phase1: moving files