[refactor] more dir madness