[Olena-patches] olena-2.0-169-gdc08d9b Move files to proper directories.