Migrated all code from EJava classes to normal Java classes to ease
maintenance (delegation is not performed yet and will be done
iteratively)