Refactored addons facets and added support for JavaSourceFacet