Resolve "Improve modularity of code."

Defendi Albertorequested to merge
19-improve-modularity-of-code into dev

Closes #19

Edited by Defendi Alberto

Merge request reports