Package refactoring
Small move in WS