Refactoring strucure directory