Separate the commontools stuff into its own module