Cleanup.
Fixing paths.
Cleanup.