Change model structure on FE

[bis-code]

After talking with my colleagues, we concluded that there is place for improvements for the model.