Package refactoring and xml layout editing