Re-org of code.