Bis version of Java classes

Due to historical reason, before my arrival, some of the Java classes have a version with the suffix "bis".

Just keep in mind that the version bis are the ones that are truly in use.

Of course, it's even better if you can remove all the bis-versions without losing too much time or breaking everything.