move composite id classes to a new package