Simplify structure

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>