Rearranging project structure.