Refactoring struct directories