Re-org of code