Fixed build
Fixed warning
Some animator organizing
Some template to apply using of new animator