Correct package path changes after repository classes refactoring