Remove unused file:cgworld etc.
Add new file:worldhandler
Modify other files slightly