rearranging project structure