Revert "* Heavy refactoring. But all are nice."
Revert "* Heavy refactoring. But all are nice."

This reverts commit ecb8a58c1e4aad85bd8eb826774b535c5374a22f.

boun-cmpe-soslab/drenaj,boun-cmpe-soslab/drenaj,boun-cmpe-soslab/drenaj,boun-cmpe-soslab/drenaj