[refactor] more dir structure work