Move tool to Batteries 2.0