Refactoring, updated dist path