Refactor and add path variables
Fix load-paths
Remove quotes in shell command