Prerequisites

• I have written a descriptive issue title
• I have searched existing issues to ensure the issue has not already been raised

Issue

The code is becoming increasingly difficult to maintain, I think it deserves a redesign as suggested here and here.

I'd like to know if you have any suggestions before proceeding, we could also consider proceeding step by step.