more dir structure refactoring