Changed the desing a bit and splitted the classes to more meaningful
packages.