finish the new code structure for load-env