Re-organise components to inc. CSS