Cleaned Up (slightly); main/World/Player

Still lots to clean up, I also need to fix how the player moves so that
it feels smoother.