Rename classes and move to new packages
Make suitorIsPreferable run in constant time