added tools directory, updated all vapor-related stuff