Structure the Code

According to our meeting this issue focuses on improving the structure of the code.

We already discussed some ideas at 452, check image below.