more directory structure refactoring