Clean up types for directory paths, still more to do