minor dir structure refactoring