Refactor the directory structure