refactoring directories around