refactor to single dir