Adjusted all contrib projects to the new architecture.