Changed some structure.
Some more fixing to last changes in structure.