Refactor World

part I