Fix for i18n

All the structure changes should be performed BEFORE any skeleton generation