Fix #65: Plugins Architecture

Fix #65