Update structure closer to original one, bump golang

[hiddenmarten]

Improved structure and bumped go, and there were some other improvements.

The very next step is fixing unit tests and uncomment linters.