Structur erefactoring finished. Tests must be modified and some scenario
tests must be performed.