[CB] refactored Team+Query as Java interfaces, several models as Java