Switch to package path usage instead of abs path