Removed some tools from aviary and reordered the remainder.