Merge 1-3-4 and 1-3-5

[AlexB8675]

We should probably merge these two, since they don't make sense to be separated

[deccer]

This is obsolete, structure has been modified already