Fixed issues with package refactor

Change-Id: I538431161c238ef0253ce117b78c4363ae8a865d