Moved som stuff around
Added worlden to cmake list.txt