Re-organizing dev structure