Fixes git and import paths