EBD-12072 moved files to make them reusable