Moved Color into model package