Big changes, they are unfinished!

In addition to some cosmetic things, there was fundamental adjustment to
the way to core structure works