Move to EL packages.
Remove useless class