More package placement refactorings