moved classes in the right package

is EU not EN
better logging system