UI-3327 : organize the structure less again