Package refactorings... 
Notice: eclipse refactoring introduced some compilation errors