Redid Category model

Redid Category model and also added evolution scripts.