more organization of externals