Started with the simplification phase
Some changes to DanLib