Restructured Models and Repository