Move setup out to own module