Move Addon ID to a more general location