Refactor silly path files into one with