Small uppdate, Renamed some classes.

Started working on the model, not done nor really as it should be.