Improve the file structure inside the project #249

Describe the issue
Improve the file structure inside the project, currently it's flat in /main. New classes are been created as we add features and improve the code to be modular. Investigate what is the best practice and what can be adopted.