Refactor: Relocated more code from r_world.h to better homes