refactor dir structure