UPDATE: Fixed path issues