Re org of code