Move stuff around
Drop unused SDL things
Move World outside of main