Merge after main data structure change
Since the start of translation task a lot of the code got restructured and put in new folders. To make sure that this change is also available for potential new branches a mid task merge seems like a good idea.