Spilt apart World.fs.
Other code clean up.