refactor structure files