#32 all tools are prepared. Now refactor is started.