Initial Architecture Change

Begins shift to Component Based