Little refactoring.
Changed packages structure.