Fix #65: Plugins Architecture

Fix #65

## Not ready to be merged