Shuffled code around in files.
Created a world data structure for layouting.