timob-12125: change file structure