Refactored code to be in several different files, dedicated methods to rendering, updating, created entity class to represent data.
Merge remote-tracking branch 'origin/master'