Refactor dir structure