Removing source
Fixing paths