Refactor basic structure files