Start making better abstractions for directory as well.