Changed the architecture to be more flexible.
Merge pull request #8 from MarcCote/change_architecture

Changed the architecture to be more flexible.