further directory refactoring