rearrange js inclusions