Fix farm_map branch and organize modules.