Moved tools to the new entity system