API: Removed unneccesary code
PLUGIN: Moved facade to a better location