Created new architecture for plugin
Fixed this reference
Merged architecture back into master