Updated Everything

Fixed and now using textures for gfx. split files apart, updated
graphics
Merge remote-tracking branch 'upstream/master'
updated from upstream