Refactoring

Refactoring to basic demo to a modular scalable solution.