ISPN-5038 Remote package refactor