Feature/modular architecture

This pull request implements the modular architecture proposal.