Refactor and add path variables
Fix load-paths