Re-organizing program structure.