Although it works now, bad delegation already start making it hard to manage. Definetly worth doing this, for both dev speed and stability purpose.

Finished.