Related to #475 (closed)

What does this MR do and why?

app-structure-type-picker is used only once, we could simplify the code and integrate it within structure-type