Reorder stuff

Signed-off-by: Igor Popov <igor@igorpopov.io>