Resolving problem introduced during rebase
Package rename and moving files