updated paths; refactoring