diff --git a/org/gcube/informationsystem/registry/etc/profile.xml b/etc/profile.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/profile.xml
rename to etc/profile.xml
diff --git a/org/gcube/informationsystem/registry/etc/pushFactory.xml b/etc/pushFactory.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/pushFactory.xml
rename to etc/pushFactory.xml
diff --git a/org/gcube/informationsystem/registry/etc/registration.properties b/etc/registration.properties
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/registration.properties
rename to etc/registration.properties
diff --git a/org/gcube/informationsystem/registry/etc/registration.xml b/etc/registration.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/registration.xml
rename to etc/registration.xml
diff --git a/org/gcube/informationsystem/registry/etc/registrationFactory.xml b/etc/registrationFactory.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/registrationFactory.xml
rename to etc/registrationFactory.xml
diff --git a/org/gcube/informationsystem/registry/etc/registrationPush.xml b/etc/registrationPush.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/registrationPush.xml
rename to etc/registrationPush.xml
diff --git a/org/gcube/informationsystem/registry/etc/security-descriptor-Factory.xml b/etc/security-descriptor-Factory.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/security-descriptor-Factory.xml
rename to etc/security-descriptor-Factory.xml
diff --git a/org/gcube/informationsystem/registry/etc/security-descriptor-Service.xml b/etc/security-descriptor-Service.xml
similarity index 100%
rename from org/gcube/informationsystem/registry/etc/security-descriptor-Service.xml
rename to etc/security-descriptor-Service.xml
diff --git a/org/gcube/informationsystem/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml b/org/gcube/informationsystem/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml
deleted file mode 100644
index e7d3fd1..0000000
--- a/org/gcube/informationsystem/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DILIGENTResource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" >
-    <UniqueID>gfgdf80-131b-11db-90fgf98-dgfgfgf66ed3f</UniqueID>
-    <ResourceType>Service</ResourceType>
-    <AuthorizationPolicies/>
-    <Profile>
-        <Class>InformationSystem</Class>
-        <Name>IS-Registry</Name>
-        <DescriptiveParameters>
-            <DescParameter/>
-        </DescriptiveParameters>
-        <QoS/>
-        <DLDependencies>
-            <DLComponent>
-                <Class>InformationSystem</Class>
-                <Name>DIS-IC</Name>
-                <DescriptiveParametersValue/>
-            </DLComponent>
-            <DLComponent>
-                <Class>InformationSystem</Class>
-                <Name>DIS-Broker</Name>
-                <DescriptiveParametersValue/>
-            </DLComponent>
-        </DLDependencies>
-        <SpecificData></SpecificData>
-        <PackagesList>
-            <Package>
-                <PackageName>DIS-Registry_Service</PackageName>
-                <PackageType>WSRFService</PackageType>
-                <Version>0.2</Version>
-                <DLMandatory value="0"/>
-                <DHNMandatory value="0"/>
-                <VOMandatory value="1"/>
-                <DisposeInterfaceSupport value="1"/>
-                <MultiVersionSupport value="0"/>
-                <VOSharingSupport value="0"/>
-                <InstallScripts/>
-                <UninstallScripts/>
-                <RebootScripts/>
-                <Dependencies>
-                    <Dependency>
-                        <Service>
-                            <Class>InformationSystem</Class>
-                            <Name>DIS-IC</Name>
-                        </Service>
-                        <PackageName>DIS-IP</PackageName>
-                        <SameDHN value="1"/>
-                        <SameDL value="0"/>
-                        <SameVO value="0"/>
-                        <Priority>1</Priority>
-                    </Dependency>
-                    <Dependency>
-                        <Service>
-                            <Class>InformationSystem</Class>
-                            <Name>DIS-IC</Name>
-                        </Service>
-                        <PackageName>DILIGENTProvider</PackageName>
-                        <SameDHN value="1"/>
-                        <SameDL value="0"/>
-                        <SameVO value="0"/>
-                        <Priority>1</Priority>
-                    </Dependency>
-                    <Dependency>
-                        <Service>
-                            <Class>InformationSystem</Class>
-                            <Name>DIS-Broker</Name>
-                        </Service>
-                        <PackageName>DIS-Broker_stubs</PackageName>
-                        <SameDHN value="1"/>
-                        <SameDL value="0"/>
-                        <SameVO value="0"/>
-                        <Priority>1</Priority>
-                    </Dependency>
-                </Dependencies>
-                <DHNRequirements>
-                    <Req category="RunTimeEnv" operator="eq" requirement="Variable" value="java1.5"/>
-                </DHNRequirements>
-                <ConfigurationFiles/>
-                <WSRFService>
-                    <GARArchive>org_diligentproject_informationservice_disregistry.gar</GARArchive>
-                    <BuildFile/>
-                    <DeploymentOptions/>
-                    <ArchitecturalPattern>Factory</ArchitecturalPattern>
-
-                    <WSRFEntry>
-                        <EntryName>diligentproject/informationservice/disregistry/DISRegistryService</EntryName>
-                        <Factory value="false"/>
-                        <Parameters/>
-                        <WSDL>
-                            <wsdl:definitions xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:tns="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryService" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" name="DISRegistry" targetNamespace="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryService">
-                                <wsdl:import location="../../../wsrf/properties/WS-ResourceProperties.wsdl" namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"/>
-                                <wsdl:import location="../../../wsrf/lifetime/WS-ResourceLifetime.wsdl" namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"/>
-
-                                <wsdl:import location="../../../wsrf/notification/WS-BaseN.wsdl" namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"/>
-                                <wsdl:types>
-                                    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryService"><!--  RESOURCE PROPERTIES -->
-                                        <xsd:element name="AuthPolicies" type="xsd:string"/>
-                                        <xsd:element name="ResourceType" type="xsd:string"/>
-                                        <xsd:element name="UniqueID" type="xsd:string"/>
-                                        <xsd:element name="Profile" type="xsd:string"/>
-                                        <xsd:element name="update" type="xsd:string"/>
-                                        <xsd:element name="updateResponse">
-
-                                            <xsd:complexType/>
-                                        </xsd:element>
-                                        <xsd:element name="DILIGENTResourceProperties">
-                                            <xsd:complexType>
-                                                <xsd:sequence>
-                                                    <xsd:element maxOccurs="1" minOccurs="1" ref="tns:UniqueID"/>
-                                                    <xsd:element maxOccurs="1" minOccurs="1" ref="tns:ResourceType"/>
-                                                    <xsd:element maxOccurs="1" minOccurs="1" ref="tns:AuthPolicies"/>
-                                                    <xsd:element maxOccurs="1" minOccurs="1" ref="tns:Profile"/>
-
-                                                </xsd:sequence>
-                                            </xsd:complexType>
-                                        </xsd:element>
-                                    </xsd:schema>
-                                </wsdl:types>
-                                <wsdl:message name="UpdateInputMessage">
-                                    <wsdl:part element="tns:update" name="parameters"/>
-                                </wsdl:message>
-                                <wsdl:message name="UpdateOutputMessage">
-
-                                    <wsdl:part element="tns:updateResponse" name="parameters"/>
-                                </wsdl:message>
-                                <wsdl:portType name="DISRegistryPortType" wsdlpp:extends="wsrpw:GetResourceProperty wsrpw:GetMultipleResourceProperties  wsrpw:SetResourceProperties  wsrpw:QueryResourceProperties              wsrlw:ImmediateResourceTermination        wsntw:NotificationProducer" wsrp:ResourceProperties="tns:DILIGENTResourceProperties">
-                                    <wsdl:operation name="update">
-                                        <wsdl:input message="tns:UpdateInputMessage"/>
-                                        <wsdl:output message="tns:UpdateOutputMessage"/>
-                                    </wsdl:operation>
-                                </wsdl:portType>
-                            </wsdl:definitions>
-
-                        </WSDL>
-                    </WSRFEntry>
-                    <WSRFEntry>
-                        <EntryName>diligentproject/informationservice/disregistry/DISRegistryFactoryService</EntryName>
-                        <Factory value="true"/>
-                        <Parameters/>
-                        <WSDL>
-                            <wsdl:definitions xmlns:tns="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryFactoryService" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns="http://schemas.xmlsoap.org/wsdl/" name="DISRegistryFactory" targetNamespace="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryFactoryService"><!--============================================================                      T Y P E S                        ============================================================-->
-
-                                <wsdl:types>
-                                    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://diligentproject.org/namespaces/informationservice/disregistry/DISRegistryFactoryService">
-                                        <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../../../ws/addressing/WS-Addressing.xsd"/><!-- REQUESTS AND RESPONSES -->
-                                        <xsd:complexType name="Map">
-                                            <xsd:sequence>
-                                                <xsd:element maxOccurs="unbounded" minOccurs="0" name="item">
-                                                    <xsd:complexType>
-                                                        <xsd:sequence>
-                                                            <xsd:element name="key" type="xsd:string"/>
-
-                                                            <xsd:element name="value" type="xsd:string"/>
-                                                        </xsd:sequence>
-                                                    </xsd:complexType>
-                                                </xsd:element>
-                                            </xsd:sequence>
-                                        </xsd:complexType>
-                                        <xsd:element name="ProfileMapping" type="tns:Map"/>
-                                        <xsd:complexType name="UpdateProfileMessage">
-                                            <xsd:sequence>
-
-                                                <xsd:element name="DiligentID" type="xsd:string"/>
-                                                <xsd:element name="xmlProfile" type="xsd:string"/>
-                                            </xsd:sequence>
-                                        </xsd:complexType>
-                                        <xsd:element name="createResource" type="xsd:string"/>
-                                        <xsd:element name="createResourceResponse">
-                                            <xsd:complexType>
-                                                <xsd:sequence>
-                                                    <xsd:element ref="wsa:EndpointReference"/>
-
-                                                </xsd:sequence>
-                                            </xsd:complexType>
-                                        </xsd:element>
-                                        <xsd:element name="updateResource" type="tns:UpdateProfileMessage">
-                                            <xsd:complexType/>
-                                        </xsd:element>
-                                        <xsd:element name="updateResourceResponse">
-                                            <xsd:complexType/>
-                                        </xsd:element>
-
-                                        <xsd:element name="removeResource" type="xsd:string"/>
-                                        <xsd:element name="removeResourceResponse">
-                                            <xsd:complexType/>
-                                        </xsd:element>
-                                        <xsd:element name="DISRegistryFactoryResourceProperties">
-                                            <xsd:complexType>
-                                                <xsd:sequence>
-                                                    <xsd:element maxOccurs="1" minOccurs="1" ref="tns:ProfileMapping"/>
-                                                </xsd:sequence>
-
-                                            </xsd:complexType>
-                                        </xsd:element>
-                                    </xsd:schema>
-                                </wsdl:types><!--============================================================                       M E S S A G E S                        ============================================================-->
-                                <wsdl:message name="CreateResourceRequest">
-                                    <wsdl:part element="tns:createResource" name="request"/>
-                                </wsdl:message>
-                                <wsdl:message name="CreateResourceResponse">
-                                    <wsdl:part element="tns:createResourceResponse" name="response"/>
-
-                                </wsdl:message>
-                                <wsdl:message name="UpdateResourceRequest">
-                                    <wsdl:part element="tns:updateResource" name="request"/>
-                                </wsdl:message>
-                                <wsdl:message name="UpdateResourceResponse">
-                                    <wsdl:part element="tns:updateResourceResponse" name="response"/>
-                                </wsdl:message>
-                                <wsdl:message name="RemoveResourceRequest">
-                                    <wsdl:part element="tns:removeResource" name="request"/>
-
-                                </wsdl:message>
-                                <wsdl:message name="RemoveResourceResponse">
-                                    <wsdl:part element="tns:removeResourceResponse" name="response"/>
-                                </wsdl:message>
-                                <wsdl:portType name="DISRegistryFactoryPortType" wsdlpp:extends="wsrpw:GetResourceProperty wsrpw:GetMultipleResourceProperties                    wsrpw:SetResourceProperties                    wsrpw:QueryResourceProperties" wsrp:ResourceProperties=" tns:DISRegistryFactoryResourceProperties">
-                                    <wsdl:operation name="createResource">
-                                        <wsdl:input message="tns:CreateResourceRequest"/>
-                                        <wsdl:output message="tns:CreateResourceResponse"/>
-                                    </wsdl:operation>
-
-                                    <wsdl:operation name="updateResource">
-                                        <wsdl:input message="tns:UpdateResourceRequest"/>
-                                        <wsdl:output message="tns:UpdateResourceResponse"/>
-                                    </wsdl:operation>
-                                    <wsdl:operation name="removeResource">
-                                        <wsdl:input message="tns:RemoveResourceRequest"/>
-                                        <wsdl:output message="tns:RemoveResourceResponse"/>
-                                    </wsdl:operation>
-                                </wsdl:portType>
-                            </wsdl:definitions>
-                        </WSDL>
-                    </WSRFEntry>
-                </WSRFService>
-            </Package>
-            <Package>
-                <PackageName>DIS-Registry_stubs</PackageName>
-                <PackageType>Library</PackageType>
-                <Version>0.2</Version>
-                <DLMandatory value="0"/>
-                <DHNMandatory value="1"/>
-                <VOMandatory value="0"/>
-                <DisposeInterfaceSupport value="0"/>
-                <MultiVersionSupport value="0"/>
-                <VOSharingSupport value="0"/>
-                <InstallScripts/>
-                <UninstallScripts/>
-                <RebootScripts/>
-                <Dependencies/>
-                <DHNRequirements>
-                    <Req category="RunTimeEnv" operator="eq" requirement="Variable" value="java1.5"/>
-                </DHNRequirements>
-                <Library>
-                    <Type>stub</Type>
-                    <IsStubOf>
-                        <PackageName>DIS-Registry_Service</PackageName>
-                        <Service>
-                            <Class>InformationSystem</Class>
-                            <Name>DIS-Registry</Name>
-                        </Service>
-                    </IsStubOf>
-                    <Parameters/>
-                    <LibraryFile>org_diligentproject_informationservice_disregistry_stubs.jar</LibraryFile>
-                </Library>
-                <OtherFiles/>
-                <OtherProperties/>
-            </Package>
-        </PackagesList>
-    </Profile>
-</DILIGENTResource>
-