Backend architecture and code fixes
Merge pull request #3 from joseospina47/master

Backend architecture and code fixes