Code cleaning
Lazy labelling of variables.

Code cleaning
Code cleaning
Move interface and abstract classes to the package of their implementations.