BS: Fixed Makefile and factored out a World object (wip)