Renamed a lot of data names,  Refactored the Model

Fixed the Model to support more of a MVVM way of dev.