Documentation refactoring to provide better structure for later