simplify
Move dir dependencies to standard_x