PIM-3196: reorganize files