Structural changes, added contracts project