Topic/with dir paths

Using the latest mundane changes with dir paths.