Re-organizing code.