Refactoring package organization under com.msopentech.odatajclient.engine.data