Moved Add-ons Server to core and some fixes - issue #77