more directory refactoring/rearrangement