Changes the structure in the model. Gets rid of
silly enums.