Reorga of source code