Minor directory refactoring