cleanup
Merge pull request #1 from isqad88/new-architecture

New architecture