Changed some structure
Again. MatrixGenerator updated (not finished)...