Adjusted paths
...
...
Restructuring