diff --git a/.gitignore b/.gitignore
index 7a17c6f..8095408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,11 @@
 ###############################################################################
-# Copyright (c) 2018 ArSysOp
+# Copyright (c) 2018-2019 ArSysOp and others
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     ArSysOp - initial API and implementation
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 287750d..24ad9f5 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
diff --git a/.project b/.project
index af4e405..db8d1e8 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.root</name>
+	<name>org.eclipse.passage.lic.root</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/LICENSE b/LICENSE
index 261eeb9..d3087e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,277 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
diff --git a/NOTICE b/NOTICE
index 1c4fa84..0719ba3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,13 +1,11 @@
-# Notices for Passage Binary Resources and Components
+# Notices for Passage Licensing Integration Components
+This content is produced and maintained by the Eclipse Passage project.
 
-This content is produced and maintained by the ArSysOp Passage team.
-
- * Project home: http://arsysop.ru
+* Project home: https://projects.eclipse.org/projects/technology.passage
 
 ## Trademarks
 
-ArSysOp, and the ArSysOp Logo are
-registered trademarks of the ArSysOp.
+Eclipse Passage is a trademark of the Eclipse Foundation.
 
 ## Copyright
 
@@ -18,19 +16,16 @@ listed source code repository logs.
 ## Declared Project Licenses
 
 This program and the accompanying materials are made available under the terms
-of the Apache Software License 2.0 which is available at 
-https://www.apache.org/licenses/LICENSE-2.0.
+of the Eclipse Public License - v 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: EPL-2.0
 
 ## Source Code
 
 The project maintains the following source code repositories:
 
- * https://github.com/arsysop/passage-brc (Binary Resources and Components)
- * https://github.com/arsysop/passage-lic (Licensing Integration Components)
- * https://github.com/arsysop/passage-loc (Licensing Operator Components)
- * https://github.com/arsysop/passage-lbc (Licensing Backend Components)
+ * https://git.eclipse.org/c/passage 
 
 ## Third-party Content
 
diff --git a/README.md b/README.md
index 7139d7e..46ba591 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Passage Licensing Integration Components (LIC) 
 
-The Passage LIC is a part of the [Passage Licensing](https://projects.eclipse.org/proposals/eclipse-passage) solution.
+The Passage LIC is a part of the [Eclipse Passage](https://projects.eclipse.org/projects/technology.passage) solution.
 This component verifies that the software has sufficient license grants in accordance with the specified licensing requirements.
 The Equinox-based implementation includes various validators for the time-limited, node-locked and other types of licenses.
 
@@ -17,16 +17,12 @@ The Passage LIC works inside your product installed on the user side. Its basic
 4. Use the system configuration and the evaluated license state to make a decision.
 5. If there are uncovered licensing requirements, call the required constraint functions to impose restrictions: limit certain functionality or disable everything.
 
-### Related repositories
-
-To find out more about the Passage Licensing solution, check out the following repositories:
-- [Passage Binary Resources and Components](https://github.com/arsysop/passage-brc)
-- [Passage Licensing Operator](https://github.com/arsysop/passage-loc)
-- [Passage Licensing Backend](https://github.com/arsysop/passage-lbc)
-
 ### License
 
-Copyright 2018 ArSysOp
+Copyright (c) 2018-2019 ArSysOp and others
 
-Licensed under the [Apache License, Version 2.0](https://projects.eclipse.org/content/apache-license-version-2.0) license, see the [LICENSE](https://github.com/arsysop/passage-lic/blob/develop/LICENSE) file for details.
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License 2.0 which is available at
+[http://www.eclipse.org/legal/epl-2.0](http://www.eclipse.org/legal/epl-2.0).
 
+SPDX-License-Identifier: EPL-2.0
diff --git a/bundles/org.eclipse.passage.lic.base/.classpath b/bundles/org.eclipse.passage.lic.base/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.base/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.runtime/.project b/bundles/org.eclipse.passage.lic.base/.project
similarity index 93%
rename from bundles/ru.arsysop.passage.lic.runtime/.project
rename to bundles/org.eclipse.passage.lic.base/.project
index c5f68c1..24f6ec8 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/.project
+++ b/bundles/org.eclipse.passage.lic.base/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.runtime</name>
+	<name>org.eclipse.passage.lic.base</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.base/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.base/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..967eeb7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.runtime.base
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.base
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.base
diff --git a/bundles/org.eclipse.passage.lic.base/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.base/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..53299d8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.base/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.base
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Base
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.base/build.properties b/bundles/org.eclipse.passage.lic.base/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.base/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseAccessManager.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseAccessManager.java
similarity index 85%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseAccessManager.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseAccessManager.java
index 3253057..c828c7b 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseAccessManager.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseAccessManager.java
@@ -1,26 +1,18 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_CONDITION_TYPE;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONDITION_TYPE;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,18 +22,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import ru.arsysop.passage.lic.base.LicensingEvents.LicensingLifeCycle;
-import ru.arsysop.passage.lic.runtime.AccessManager;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.ConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.PermissionExaminer;
-import ru.arsysop.passage.lic.runtime.RestrictionExecutor;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.base.LicensingEvents.LicensingLifeCycle;
+import org.eclipse.passage.lic.runtime.AccessManager;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.ConfigurationResolver;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.PermissionExaminer;
+import org.eclipse.passage.lic.runtime.RestrictionExecutor;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public abstract class BaseAccessManager implements AccessManager {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConditionEvaluator.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConditionEvaluator.java
similarity index 70%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConditionEvaluator.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConditionEvaluator.java
index e0e2aee..23edcad 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConditionEvaluator.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConditionEvaluator.java
@@ -1,34 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public abstract class BaseConditionEvaluator implements ConditionEvaluator {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConfigurationRequirement.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConfigurationRequirement.java
similarity index 63%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConfigurationRequirement.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConfigurationRequirement.java
index e6cb16e..f9751fc 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConfigurationRequirement.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConfigurationRequirement.java
@@ -1,32 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_NAME;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_NAME;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
 
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class BaseConfigurationRequirement implements ConfigurationRequirement {
 	
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseFeaturePermission.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseFeaturePermission.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseFeaturePermission.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseFeaturePermission.java
index 3a1497f..9776610 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseFeaturePermission.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseFeaturePermission.java
@@ -1,32 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 
 import java.util.Date;
 
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class BaseFeaturePermission implements FeaturePermission {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingCondition.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingCondition.java
similarity index 73%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingCondition.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingCondition.java
index 6347ce3..c660b4f 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingCondition.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingCondition.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 
 import java.util.Date;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 
 public class BaseLicensingCondition implements LicensingCondition {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingConfiguration.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingConfiguration.java
similarity index 68%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingConfiguration.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingConfiguration.java
index 3e6d9aa..b16bbf5 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseLicensingConfiguration.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseLicensingConfiguration.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 
 import java.util.Objects;
 
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class BaseLicensingConfiguration implements LicensingConfiguration {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BasePermissionExaminer.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePermissionExaminer.java
similarity index 75%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BasePermissionExaminer.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePermissionExaminer.java
index 20a5c59..96eec81 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BasePermissionExaminer.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePermissionExaminer.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,12 +20,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import ru.arsysop.passage.lic.base.LicensingEvents.LicensingConditionEvents;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.PermissionExaminer;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.base.LicensingEvents.LicensingConditionEvents;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.PermissionExaminer;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public abstract class BasePermissionExaminer implements PermissionExaminer {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseRestrictionVerdict.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseRestrictionVerdict.java
similarity index 51%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseRestrictionVerdict.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseRestrictionVerdict.java
index e196258..471aec7 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseRestrictionVerdict.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseRestrictionVerdict.java
@@ -1,27 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public class BaseRestrictionVerdict implements RestrictionVerdict {
 	
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/ConfigurationRequirements.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/ConfigurationRequirements.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/ConfigurationRequirements.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/ConfigurationRequirements.java
index 9cb3acb..ff20647 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/ConfigurationRequirements.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/ConfigurationRequirements.java
@@ -1,42 +1,34 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.ATTRIBUTE_LEVEL;
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.ATTRIBUTE_NAME;
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.ATTRIBUTE_VERSION;
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.CAPABILITY_LICENSING_FEATURE;
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.toLevelAttribute;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_DEFAULT;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR;
-import static ru.arsysop.passage.lic.base.LicensingProperties.toRestrictionLevelProperty;
+import static org.eclipse.passage.lic.base.LicensingNamespaces.ATTRIBUTE_LEVEL;
+import static org.eclipse.passage.lic.base.LicensingNamespaces.ATTRIBUTE_NAME;
+import static org.eclipse.passage.lic.base.LicensingNamespaces.ATTRIBUTE_VERSION;
+import static org.eclipse.passage.lic.base.LicensingNamespaces.CAPABILITY_LICENSING_FEATURE;
+import static org.eclipse.passage.lic.base.LicensingNamespaces.toLevelAttribute;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_DEFAULT;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR;
+import static org.eclipse.passage.lic.base.LicensingProperties.toRestrictionLevelProperty;
 
 import java.util.Collections;
 import java.util.Map;
 
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class ConfigurationRequirements {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/FeaturePermissions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FeaturePermissions.java
similarity index 52%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/FeaturePermissions.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FeaturePermissions.java
index 17d7b95..41aa4ad 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/FeaturePermissions.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FeaturePermissions.java
@@ -1,29 +1,21 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.Date;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class FeaturePermissions {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConditions.java
similarity index 69%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConditions.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConditions.java
index abd9f8d..18e3536 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConditions.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConditions.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConfigurations.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConfigurations.java
similarity index 61%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConfigurations.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConfigurations.java
index b6ceb78..f44ba09 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingConfigurations.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingConfigurations.java
@@ -1,28 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.Map;
 
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class LicensingConfigurations {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingEvents.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingEvents.java
similarity index 75%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingEvents.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingEvents.java
index a942fee..b1873d6 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingEvents.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingEvents.java
@@ -1,28 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 
 public class LicensingEvents {
 	
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingNamespaces.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingNamespaces.java
similarity index 70%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingNamespaces.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingNamespaces.java
index 135f474..c16d331 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingNamespaces.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingNamespaces.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 public final class LicensingNamespaces {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingPaths.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingPaths.java
similarity index 71%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingPaths.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingPaths.java
index f3bcbfc..651344c 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingPaths.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingPaths.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class LicensingPaths {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingProperties.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingProperties.java
similarity index 81%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingProperties.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingProperties.java
index 1422152..8caca61 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingProperties.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingProperties.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 public final class LicensingProperties {
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingVersions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingVersions.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingVersions.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingVersions.java
index ad3f322..7d4c530 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/LicensingVersions.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/LicensingVersions.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.Objects;
 
diff --git a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/RestrictionVerdictComparator.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/RestrictionVerdictComparator.java
similarity index 59%
rename from bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/RestrictionVerdictComparator.java
rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/RestrictionVerdictComparator.java
index 520cf6a..a68dbec 100644
--- a/bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/RestrictionVerdictComparator.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/RestrictionVerdictComparator.java
@@ -1,32 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_FATAL;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_WARN;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_FATAL;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL_WARN;
 
 import java.util.Comparator;
 
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public class RestrictionVerdictComparator implements Comparator<RestrictionVerdict> {
 	
diff --git a/bundles/org.eclipse.passage.lic.bc/.classpath b/bundles/org.eclipse.passage.lic.bc/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.bc/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.json/.project b/bundles/org.eclipse.passage.lic.bc/.project
similarity index 94%
rename from bundles/ru.arsysop.passage.lic.json/.project
rename to bundles/org.eclipse.passage.lic.bc/.project
index 59713c0..9760263 100644
--- a/bundles/ru.arsysop.passage.lic.json/.project
+++ b/bundles/org.eclipse.passage.lic.bc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.json</name>
+	<name>org.eclipse.passage.lic.bc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.base/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.bc/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.bc/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.bc/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.bc/META-INF/MANIFEST.MF
similarity index 59%
rename from bundles/ru.arsysop.passage.lic.bc/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.bc/META-INF/MANIFEST.MF
index 324782f..1770fae 100644
--- a/bundles/ru.arsysop.passage.lic.bc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.bc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.bc
+Automatic-Module-Name: org.eclipse.passage.lic.bc
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.bc
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.bc
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0",
  org.bouncycastle.bcpg;bundle-version="1.59.0",
  org.bouncycastle.bcpkix;bundle-version="1.59.0",
  org.bouncycastle.bcprov;bundle-version="1.59.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0"
-Export-Package: ru.arsysop.passage.lic.bc;x-internal:=true
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0"
+Export-Package: org.eclipse.passage.lic.bc;x-internal:=true
diff --git a/bundles/org.eclipse.passage.lic.bc/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.bc/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..1948d52
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.bc/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.bc
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC BC
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.bc/build.properties b/bundles/org.eclipse.passage.lic.bc/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.bc/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcDigest.java b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcDigest.java
new file mode 100644
index 0000000..ae7e7bd
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcDigest.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.bc;
+
+import org.bouncycastle.crypto.digests.SHA512Digest;
+
+public class BcDigest {
+	
+	private BcDigest() {
+		//block
+	}
+
+	public static byte[] calculateDigest(byte[] source) {
+		final SHA512Digest dig = new SHA512Digest();
+		dig.reset();
+		dig.update(source, 0, source.length);
+		final byte[] digest = new byte[dig.getDigestSize()];
+		dig.doFinal(digest, 0);
+		return digest;
+	}
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcProperties.java b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcProperties.java
similarity index 62%
rename from bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcProperties.java
rename to bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcProperties.java
index 13e4e3e..bf445ee 100644
--- a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcProperties.java
+++ b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcProperties.java
@@ -1,28 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.bc;
+package org.eclipse.passage.lic.bc;
 
 import java.util.Map;
 
-import ru.arsysop.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.base.LicensingProperties;
 
 public class BcProperties {
 	
diff --git a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcStreamCodec.java b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcStreamCodec.java
similarity index 94%
rename from bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcStreamCodec.java
rename to bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcStreamCodec.java
index 89781ec..dd93500 100644
--- a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcStreamCodec.java
+++ b/bundles/org.eclipse.passage.lic.bc/src/org/eclipse/passage/lic/bc/BcStreamCodec.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.bc;
+package org.eclipse.passage.lic.bc;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
@@ -79,10 +71,9 @@
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
 import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
+import org.eclipse.passage.lic.runtime.io.StreamCodec;
 import org.osgi.service.component.annotations.Activate;
 
-import ru.arsysop.passage.lic.runtime.io.StreamCodec;
-
 public class BcStreamCodec implements StreamCodec {
 
 	static {
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/.classpath b/bundles/org.eclipse.passage.lic.emf.edit/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.model.core/.project b/bundles/org.eclipse.passage.lic.emf.edit/.project
similarity index 93%
rename from bundles/ru.arsysop.passage.lic.model.core/.project
rename to bundles/org.eclipse.passage.lic.emf.edit/.project
index 36f633e..41a6f11 100644
--- a/bundles/ru.arsysop.passage.lic.model.core/.project
+++ b/bundles/org.eclipse.passage.lic.emf.edit/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.model.core</name>
+	<name>org.eclipse.passage.lic.emf.edit</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.bc/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.emf.edit/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.bc/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.emf.edit/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf.edit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..33e8882
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.emf.edit
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.emf.edit
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.registry;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.emf.edit
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.emf.edit/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..0752dc2
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.emf.edit
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC EMF Edit
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/build.properties b/bundles/org.eclipse.passage.lic.emf.edit/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ClassifierInitializer.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ClassifierInitializer.java
new file mode 100644
index 0000000..6d8240b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ClassifierInitializer.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+public interface ClassifierInitializer {
+
+	String newObjectIdentifier();
+
+	String newObjectName();
+
+	String newFileName();
+
+	String newObjectTitle();
+
+	String newObjectMessage();
+
+	String newFileMessage();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ComposedAdapterFactoryProvider.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ComposedAdapterFactoryProvider.java
new file mode 100644
index 0000000..b895797
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/ComposedAdapterFactoryProvider.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+
+public interface ComposedAdapterFactoryProvider {
+	
+	ComposedAdapterFactory getComposedAdapterFactory();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainContentAdapter.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainContentAdapter.java
new file mode 100644
index 0000000..8071ca2
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainContentAdapter.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.passage.lic.registry.Identified;
+
+public abstract class DomainContentAdapter<R extends EditingDomainRegistry> extends EContentAdapter {
+	
+	protected final R registry;
+	
+	protected DomainContentAdapter(R registry) {
+		this.registry = registry;
+	}
+	
+	@Override
+	public void notifyChanged(Notification notification) {
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof ResourceSet) {
+			ResourceSet resourceSet = (ResourceSet) notifier;
+			switch (notification.getFeatureID(ResourceSet.class)) {
+			case ResourceSet.RESOURCE_SET__RESOURCES:
+				processResourceSetResources(resourceSet, notification);
+				break;
+			default:
+				break;
+			}
+		} else if (notifier instanceof Resource) {
+			Resource resource = (Resource) notifier;
+			switch (notification.getFeatureID(Resource.class)) {
+			case Resource.RESOURCE__CONTENTS:
+				processResourceContents(resource, notification);
+			case Resource.RESOURCE__IS_LOADED:
+				processResourceIsLoaded(resource, notification);
+				break;
+			default:
+				break;
+			}
+		}
+		super.notifyChanged(notification);
+	}
+
+	protected void processResourceSetResources(ResourceSet resourceSet, Notification notification) {
+		//nothing by default
+	}
+	
+	protected void processResourceContents(Resource resource, Notification notification) {
+		Object oldValue = notification.getOldValue();
+		Object newValue = notification.getNewValue();
+		switch (notification.getEventType()) {
+		case Notification.ADD:
+			processResourceContentsAdded(resource, newValue);
+			break;
+		case Notification.REMOVE:
+			processResourceContentsRemoved(resource, oldValue);
+			break;
+	
+		default:
+			break;
+		}
+	}
+
+	protected void processResourceContentsAdded(Resource resource, Object newValue) {
+		if (newValue instanceof Identified) {
+			Identified identified = (Identified) newValue;
+			registry.registerContent(identified);
+		}
+	}
+
+	protected void processResourceContentsRemoved(Resource resource, Object oldValue) {
+		if (oldValue instanceof Identified) {
+			Identified identified = (Identified) oldValue;
+			registry.unregisterContent(identified.getIdentifier());
+		}
+	}
+
+	protected void processResourceIsLoaded(Resource resource, Notification notification) {
+		//nothing by default
+	}
+	
+}
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainRegistryAccess.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainRegistryAccess.java
new file mode 100644
index 0000000..58ddf94
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/DomainRegistryAccess.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+public interface DomainRegistryAccess {
+	
+	String PROPERTY_DOMAIN_NAME = "org.eclipse.passage.lic.emf.edit.domain.name"; //$NON-NLS-1$
+	String PROPERTY_FILE_EXTENSION = "org.eclipse.passage.lic.emf.edit.file.extension"; //$NON-NLS-1$
+	
+	EditingDomainRegistry getDomainRegistry(String domain);
+
+	String getFileExtension(String domain);
+
+	ClassifierInitializer getClassifierInitializer(String domain);
+
+	SelectionCommandAdvisor getSelectionCommandAdvisor(String domain);
+}
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/EditingDomainRegistry.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/EditingDomainRegistry.java
new file mode 100644
index 0000000..0707233
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/EditingDomainRegistry.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+import java.nio.file.Path;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.passage.lic.registry.DescriptorRegistry;
+import org.eclipse.passage.lic.registry.Identified;
+
+public interface EditingDomainRegistry extends DescriptorRegistry, IEditingDomainProvider, ComposedAdapterFactoryProvider {
+	
+	void registerContent(Identified content);
+
+	void unregisterContent(String identifier);
+
+	String getFileExtension();
+	
+	Path getBasePath();
+	
+	EClass getContentClassifier();
+
+	EStructuralFeature getContentIdentifierAttribute();
+
+	EStructuralFeature getContentNameAttribute();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/LabeledDiagnostician.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/LabeledDiagnostician.java
new file mode 100644
index 0000000..1061545
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/LabeledDiagnostician.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+
+public class LabeledDiagnostician extends Diagnostician {
+	private final AdapterFactory adapterFactory;
+
+	public LabeledDiagnostician(AdapterFactory adapterFactory) {
+		this.adapterFactory = adapterFactory;
+	}
+
+	@Override
+	public String getObjectLabel(EObject eObject) {
+		if (adapterFactory != null && !eObject.eIsProxy()) {
+			IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(eObject,
+					IItemLabelProvider.class);
+			if (itemLabelProvider != null) {
+				return itemLabelProvider.getText(eObject);
+			}
+		}
+
+		return super.getObjectLabel(eObject);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/SelectionCommandAdvisor.java b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/SelectionCommandAdvisor.java
new file mode 100644
index 0000000..60b104d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.emf.edit/src/org/eclipse/passage/lic/emf/edit/SelectionCommandAdvisor.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.emf.edit;
+
+public interface SelectionCommandAdvisor {
+
+	String getSelectionTitle(String classifier);
+
+	Iterable<?> getSelectionInput(String classifier);
+}
diff --git a/bundles/org.eclipse.passage.lic.equinox/.classpath b/bundles/org.eclipse.passage.lic.equinox/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/.project b/bundles/org.eclipse.passage.lic.equinox/.project
similarity index 93%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/.project
rename to bundles/org.eclipse.passage.lic.equinox/.project
index 6403499..4ff1cf3 100644
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/.project
+++ b/bundles/org.eclipse.passage.lic.equinox/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.inspector.ui</name>
+	<name>org.eclipse.passage.lic.equinox</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.equinox/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.equinox/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.equinox/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.equinox/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
similarity index 53%
rename from bundles/ru.arsysop.passage.lic.equinox/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
index b3d0621..dd6b0c7 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.equinox
+Automatic-Module-Name: org.eclipse.passage.lic.equinox
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.equinox
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.equinox
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.osgi.services;bundle-version="0.0.0";visibility:=reexport,
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
- ru.arsysop.passage.lic.base;bundle-version="0.0.0"
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.base;bundle-version="0.0.0"
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: ru.arsysop.passage.lic.equinox,
- ru.arsysop.passage.lic.internal.equinox;x-internal:=true
-Provide-Capability: licensing.management;licensing.management="equinox";version="0.3.2"
+Export-Package: org.eclipse.passage.lic.equinox,
+ org.eclipse.passage.lic.internal.equinox;x-internal:=true
+Provide-Capability: licensing.management;licensing.management="equinox";version="0.3.3"
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/META-INF/p2.inf b/bundles/org.eclipse.passage.lic.equinox/META-INF/p2.inf
new file mode 100644
index 0000000..32d3700
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/p2.inf
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+provides.0.namespace = licensing.management
+provides.0.name = equinox
+provides.0.version = 0.3.3
diff --git a/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..28bb26b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.equinox
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Equinox
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.BundleCapabilityResolver.xml b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.BundleCapabilityResolver.xml
new file mode 100644
index 0000000..02091bf
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.BundleCapabilityResolver.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.passage.lic.internal.equinox.BundleCapabilityResolver">
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.ConfigurationResolver"/>
+   </service>
+   <implementation class="org.eclipse.passage.lic.internal.equinox.BundleCapabilityResolver"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver.xml b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver.xml
similarity index 56%
rename from bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver.xml
rename to bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver.xml
index a150f9c..373878c 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver.xml
+++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver">
-   <implementation class="ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver">
+   <implementation class="org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver"/>
    <reference bind="bindLoggerFactory" interface="org.osgi.service.log.LoggerFactory" name="LoggerFactory" unbind="unbindLoggerFactory"/>
    <reference bind="bindScr" interface="org.osgi.service.component.runtime.ServiceComponentRuntime" name="Scr" unbind="unbindScr"/>
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConfigurationResolver"/>
+      <provide interface="org.eclipse.passage.lic.runtime.ConfigurationResolver"/>
    </service>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager.xml b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager.xml
new file mode 100644
index 0000000..74177c2
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager">
+   <implementation class="org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.AccessManager"/>
+   </service>
+   <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
+   <reference bind="bindLogService" cardinality="1..1" interface="org.osgi.service.log.LogService" name="LogService" policy="static" unbind="unbindLogService"/>
+   <reference bind="bindConfigurationResolver" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.ConfigurationResolver" name="ConfigurationResolver" policy="static" unbind="unbindConfigurationResolver"/>
+   <reference bind="bindConditionMiner" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.ConditionMiner" name="ConditionMiner" policy="static" unbind="unbindConditionMiner"/>
+   <reference bind="bindConditionEvaluator" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.ConditionEvaluator" name="ConditionEvaluator" policy="static" unbind="unbindConditionEvaluator"/>
+   <reference bind="bindPermissionExaminer" cardinality="1..1" interface="org.eclipse.passage.lic.runtime.PermissionExaminer" name="PermissionExaminer" policy="static" unbind="unbindPermissionExaminer"/>
+   <reference bind="bindRestrictionExecutor" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.RestrictionExecutor" name="RestrictionExecutor" policy="static" unbind="unbindRestrictionExecutor"/>
+</scr:component>
diff --git a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml
similarity index 52%
rename from bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml
rename to bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml
index ce496a7..ab0f546 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml
+++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/org.eclipse.passage.lic.internal.equinox.EquinoxPermissionExaminer.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.equinox.EquinoxPermissionExaminer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.equinox.EquinoxPermissionExaminer">
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.PermissionExaminer"/>
+      <provide interface="org.eclipse.passage.lic.runtime.PermissionExaminer"/>
    </service>
    <reference bind="bindEventAdmin" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" unbind="unbindEventAdmin"/>
-   <implementation class="ru.arsysop.passage.lic.internal.equinox.EquinoxPermissionExaminer"/>
+   <implementation class="org.eclipse.passage.lic.internal.equinox.EquinoxPermissionExaminer"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.equinox/build.properties b/bundles/org.eclipse.passage.lic.equinox/build.properties
new file mode 100644
index 0000000..33ea891
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/BundleKeyKeeper.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/BundleKeyKeeper.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/BundleKeyKeeper.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/BundleKeyKeeper.java
index 52ade62..5ccb952 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/BundleKeyKeeper.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/BundleKeyKeeper.java
@@ -1,39 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.equinox;
+package org.eclipse.passage.lic.equinox;
 
-import static ru.arsysop.passage.lic.base.LicensingPaths.*;
+import static org.eclipse.passage.lic.base.LicensingPaths.*;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.io.KeyKeeper;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.io.KeyKeeper;
-
 public class BundleKeyKeeper implements KeyKeeper {
 
 	private static final String PATH_DEFAULT = "OSGI-INF/"; //$NON-NLS-1$
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/EnvironmentBasedConditionMiner.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EnvironmentBasedConditionMiner.java
similarity index 85%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/EnvironmentBasedConditionMiner.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EnvironmentBasedConditionMiner.java
index 56539ea..bdc0215 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/EnvironmentBasedConditionMiner.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EnvironmentBasedConditionMiner.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.equinox;
+package org.eclipse.passage.lic.equinox;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,20 +30,19 @@
 import java.util.logging.Logger;
 
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.base.LicensingPaths;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.io.KeyKeeper;
+import org.eclipse.passage.lic.runtime.io.LicensingConditionTransport;
+import org.eclipse.passage.lic.runtime.io.StreamCodec;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.base.LicensingPaths;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
-import ru.arsysop.passage.lic.runtime.io.StreamCodec;
-import ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport;
-import ru.arsysop.passage.lic.runtime.io.KeyKeeper;
-
 public class EnvironmentBasedConditionMiner implements ConditionMiner {
 	
 	private final Logger logger = Logger.getLogger(EnvironmentBasedConditionMiner.class.getName());
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/LicensingBundles.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicensingBundles.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/LicensingBundles.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicensingBundles.java
index 69af3f8..df5a843 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/equinox/LicensingBundles.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicensingBundles.java
@@ -1,34 +1,25 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.equinox;
+package org.eclipse.passage.lic.equinox;
 
 import java.util.Collections;
 
+import org.eclipse.passage.lic.base.LicensingNamespaces;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRequirement;
 import org.osgi.framework.wiring.BundleWiring;
 
-import ru.arsysop.passage.lic.base.LicensingNamespaces;
-
 public class LicensingBundles {
 
 	public static Iterable<BundleRequirement> extractLicensingManagementRequirements(Bundle bundle) {
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/BundleCapabilityResolver.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/BundleCapabilityResolver.java
similarity index 68%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/BundleCapabilityResolver.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/BundleCapabilityResolver.java
index dc439a7..2bf17bc 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/BundleCapabilityResolver.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/BundleCapabilityResolver.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.equinox;
+package org.eclipse.passage.lic.internal.equinox;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import org.eclipse.passage.lic.base.BaseConfigurationRequirement;
+import org.eclipse.passage.lic.base.ConfigurationRequirements;
+import org.eclipse.passage.lic.base.LicensingNamespaces;
+import org.eclipse.passage.lic.base.LicensingVersions;
+import org.eclipse.passage.lic.equinox.LicensingBundles;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.ConfigurationResolver;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.wiring.BundleCapability;
@@ -33,15 +33,6 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 
-import ru.arsysop.passage.lic.base.BaseConfigurationRequirement;
-import ru.arsysop.passage.lic.base.ConfigurationRequirements;
-import ru.arsysop.passage.lic.base.LicensingNamespaces;
-import ru.arsysop.passage.lic.base.LicensingVersions;
-import ru.arsysop.passage.lic.equinox.LicensingBundles;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.ConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 @Component
 public class BundleCapabilityResolver implements ConfigurationResolver {
 
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/ComponentConfigurationResolver.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ComponentConfigurationResolver.java
similarity index 72%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/ComponentConfigurationResolver.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ComponentConfigurationResolver.java
index 017c46b..e43632f 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/ComponentConfigurationResolver.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ComponentConfigurationResolver.java
@@ -1,29 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.equinox;
+package org.eclipse.passage.lic.internal.equinox;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.eclipse.passage.lic.base.BaseConfigurationRequirement;
+import org.eclipse.passage.lic.base.ConfigurationRequirements;
+import org.eclipse.passage.lic.base.LicensingNamespaces;
+import org.eclipse.passage.lic.base.LicensingVersions;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.ConfigurationResolver;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
@@ -35,14 +34,6 @@
 import org.osgi.service.log.Logger;
 import org.osgi.service.log.LoggerFactory;
 
-import ru.arsysop.passage.lic.base.BaseConfigurationRequirement;
-import ru.arsysop.passage.lic.base.ConfigurationRequirements;
-import ru.arsysop.passage.lic.base.LicensingNamespaces;
-import ru.arsysop.passage.lic.base.LicensingVersions;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.ConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 @Component
 public class ComponentConfigurationResolver implements ConfigurationResolver {
 	
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxAccessManager.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxAccessManager.java
similarity index 77%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxAccessManager.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxAccessManager.java
index 392fb73..e24ac84 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxAccessManager.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxAccessManager.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.equinox;
+package org.eclipse.passage.lic.internal.equinox;
 
 import java.util.Map;
 
+import org.eclipse.passage.lic.base.BaseAccessManager;
+import org.eclipse.passage.lic.equinox.LicensingBundles;
+import org.eclipse.passage.lic.runtime.AccessManager;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.ConfigurationResolver;
+import org.eclipse.passage.lic.runtime.PermissionExaminer;
+import org.eclipse.passage.lic.runtime.RestrictionExecutor;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -34,15 +34,6 @@
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.base.BaseAccessManager;
-import ru.arsysop.passage.lic.equinox.LicensingBundles;
-import ru.arsysop.passage.lic.runtime.AccessManager;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
-import ru.arsysop.passage.lic.runtime.ConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.PermissionExaminer;
-import ru.arsysop.passage.lic.runtime.RestrictionExecutor;
-
 public class EquinoxAccessManager extends BaseAccessManager implements AccessManager, BundleListener {
 
 	private EventAdmin eventAdmin;
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxEvents.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxEvents.java
similarity index 51%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxEvents.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxEvents.java
index 011b0ee..5cb6b9e 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxEvents.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxEvents.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.equinox;
+package org.eclipse.passage.lic.internal.equinox;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxPermissionExaminer.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxPermissionExaminer.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxPermissionExaminer.java
rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxPermissionExaminer.java
index c9142d0..bc67a3c 100644
--- a/bundles/ru.arsysop.passage.lic.equinox/src/ru/arsysop/passage/lic/internal/equinox/EquinoxPermissionExaminer.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EquinoxPermissionExaminer.java
@@ -1,33 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.equinox;
+package org.eclipse.passage.lic.internal.equinox;
 
+import org.eclipse.passage.lic.base.BasePermissionExaminer;
+import org.eclipse.passage.lic.runtime.PermissionExaminer;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
-import ru.arsysop.passage.lic.base.BasePermissionExaminer;
-import ru.arsysop.passage.lic.runtime.PermissionExaminer;
-
 @Component
 public class EquinoxPermissionExaminer extends BasePermissionExaminer implements PermissionExaminer {
 
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/.classpath b/bundles/org.eclipse.passage.lic.inspector.ui/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/.project b/bundles/org.eclipse.passage.lic.inspector.ui/.project
new file mode 100644
index 0000000..81caefb
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.inspector.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.inspector.ui/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.inspector.ui/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.inspector.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fe732de
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.passage.lic.inspector.ui
+Bundle-Version: 0.3.3.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
+ org.eclipse.osgi.services;bundle-version="0.0.0",
+ org.eclipse.e4.core.di,
+ org.eclipse.e4.core.services;bundle-version="0.0.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.0.0",
+ org.eclipse.passage.lic.jface;bundle-version="0.0.0",
+ org.eclipse.passage.lic.model.edit;bundle-version="0.0.0",
+ org.eclipse.passage.lic.inspector;bundle-version="0.0.0"
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.passage.lic.inspector.ui
+Import-Package: javax.inject;version="1.0.0"
+Export-Package: org.eclipse.passage.lic.inspector.ui.dialogs,
+ org.eclipse.passage.lic.inspector.ui.handlers
+Service-Component: OSGI-INF/*.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..744f56e
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.inspector.ui
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Inspector UI
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/org.eclipse.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml b/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/org.eclipse.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml
new file mode 100644
index 0000000..3eed072
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/OSGI-INF/org.eclipse.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.passage.lic.internal.inspector.ui.LicesnsingImageRegistry">
+   <service>
+      <provide interface="org.eclipse.passage.lic.jface.LicensingImages"/>
+   </service>
+   <implementation class="org.eclipse.passage.lic.internal.inspector.ui.LicesnsingImageRegistry"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/build.properties b/bundles/org.eclipse.passage.lic.inspector.ui/build.properties
new file mode 100644
index 0000000..6f93480
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               icons/
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/icons/etool16/hw-inspector.png b/bundles/org.eclipse.passage.lic.inspector.ui/icons/etool16/hw-inspector.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/icons/etool16/hw-inspector.png
rename to bundles/org.eclipse.passage.lic.inspector.ui/icons/etool16/hw-inspector.png
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/LicInspectorUi.java b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/LicInspectorUi.java
new file mode 100644
index 0000000..8b8a5b9
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/LicInspectorUi.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.inspector.ui;
+
+public class LicInspectorUi {
+	
+	public static final String IMG_INSPECTOR = "IMG_INSPECTOR"; //$NON-NLS-1$
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java
similarity index 67%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java
rename to bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java
index 1bacbc9..304bf87 100644
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/HardwareInspectorDialog.java
@@ -1,39 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.inspector.ui.dialogs;
+package org.eclipse.passage.lic.inspector.ui.dialogs;
 
 import java.io.ByteArrayOutputStream;
 
 import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.inspector.ui.LicInspectorUi;
+import org.eclipse.passage.lic.jface.LicensingImages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import ru.arsysop.passage.lic.base.ui.LicensingImages;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.inspector.ui.LicInspectorUi;
-
 public class HardwareInspectorDialog extends TrayDialog {
 	
 	private final LicensingImages licensingImages;
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java
rename to bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java
index a5e4848..970d6e9 100644
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/dialogs/LicensingInspectorDialog.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.inspector.ui.dialogs;
+package org.eclipse.passage.lic.inspector.ui.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,6 +25,12 @@
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.inspector.ui.LicInspectorUi;
+import org.eclipse.passage.lic.jface.LicensingImages;
+import org.eclipse.passage.lic.jface.RestrictionVerdictLabels;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.graphics.Image;
@@ -46,13 +44,6 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 
-import ru.arsysop.passage.lic.base.ui.LicensingImages;
-import ru.arsysop.passage.lic.base.ui.RestrictionVerdictLabels;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.inspector.ui.LicInspectorUi;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
-
 public class LicensingInspectorDialog extends TitleAreaDialog {
 
 	public static final int HARDWARE_INSPECTOR_ID = IDialogConstants.CLIENT_ID + 1;
diff --git a/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/handlers/InspectHardwareHandler.java b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/handlers/InspectHardwareHandler.java
new file mode 100644
index 0000000..33f6013
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/inspector/ui/handlers/InspectHardwareHandler.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.inspector.ui.handlers;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.inspector.ui.dialogs.HardwareInspectorDialog;
+import org.eclipse.passage.lic.jface.LicensingImages;
+import org.eclipse.swt.widgets.Shell;
+
+public class InspectHardwareHandler {
+
+	@Execute
+	public void execute(LicensingImages images, HardwareInspector inspector, Shell shell) {
+		HardwareInspectorDialog dialog = new HardwareInspectorDialog(images, inspector, shell);
+		dialog.open();
+	}
+		
+}
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java
similarity index 73%
rename from bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java
rename to bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java
index 7bfd52a..b62e3f3 100644
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java
+++ b/bundles/org.eclipse.passage.lic.inspector.ui/src/org/eclipse/passage/lic/internal/inspector/ui/LicesnsingImageRegistry.java
@@ -1,39 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.inspector.ui;
+package org.eclipse.passage.lic.internal.inspector.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.passage.lic.inspector.ui.LicInspectorUi;
+import org.eclipse.passage.lic.jface.LicensingImages;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 import org.eclipse.swt.graphics.Image;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 
-import ru.arsysop.passage.lic.base.ui.LicensingImages;
-import ru.arsysop.passage.lic.inspector.ui.LicInspectorUi;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
-
 @Component
 public class LicesnsingImageRegistry implements LicensingImages {
 
@@ -48,7 +39,7 @@ public void activate() {
 	}
 
 	protected void addBaseImages() {
-		String pattern = "platform:/plugin/ru.arsysop.passage.lic.base.ui/icons/obj16/%s"; //$NON-NLS-1$
+		String pattern = "platform:/plugin/org.eclipse.passage.lic.jface/icons/obj16/%s"; //$NON-NLS-1$
 		register(IMG_DEFAULT, String.format(pattern, "passage.png")); //$NON-NLS-1$
 		register(IMG_LEVEL_OK, String.format(pattern, "ok.png")); //$NON-NLS-1$
 		register(IMG_LEVEL_INFO, String.format(pattern, "info.png")); //$NON-NLS-1$
@@ -58,7 +49,7 @@ protected void addBaseImages() {
 	}
 
 	protected void addModelImages() {
-		String pattern = "platform:/plugin/ru.arsysop.passage.lic.model.edit/icons/full/obj16/%s"; //$NON-NLS-1$
+		String pattern = "platform:/plugin/org.eclipse.passage.lic.model.edit/icons/full/obj16/%s"; //$NON-NLS-1$
 		LicPackage lic = LicPackage.eINSTANCE;
 
 		register(lic.getFeatureSet().getName(), String.format(pattern, "feature.png")); //$NON-NLS-1$
@@ -78,7 +69,7 @@ protected void addModelImages() {
 	}
 
 	protected void addInspectorImages() {
-		String pattern = "platform:/plugin/ru.arsysop.passage.lic.inspector.ui/icons/etool16/%s"; //$NON-NLS-1$
+		String pattern = "platform:/plugin/org.eclipse.passage.lic.inspector.ui/icons/etool16/%s"; //$NON-NLS-1$
 		register(LicInspectorUi.IMG_INSPECTOR, String.format(pattern, "hw-inspector.png")); //$NON-NLS-1$
 	}
 
diff --git a/bundles/org.eclipse.passage.lic.inspector/.classpath b/bundles/org.eclipse.passage.lic.inspector/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/ru.arsysop.passage.lic.base.tests/.project b/bundles/org.eclipse.passage.lic.inspector/.project
similarity index 92%
rename from tests/ru.arsysop.passage.lic.base.tests/.project
rename to bundles/org.eclipse.passage.lic.inspector/.project
index b37a83a..087a9dc 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/.project
+++ b/bundles/org.eclipse.passage.lic.inspector/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.base.tests</name>
+	<name>org.eclipse.passage.lic.inspector</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.inspector/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.inspector/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.inspector/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.inspector/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.inspector/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.inspector/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3c90138
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.inspector
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.inspector
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.passage.lic.inspector
diff --git a/bundles/org.eclipse.passage.lic.inspector/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.inspector/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..f158d02
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.inspector
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Inspector
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.inspector/build.properties b/bundles/org.eclipse.passage.lic.inspector/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/ConditionInpector.java b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/ConditionInpector.java
new file mode 100644
index 0000000..c525590
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/ConditionInpector.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.inspector;
+
+public interface ConditionInpector {
+	
+	String getDefaultType();
+
+	Iterable<String> getSupportedTypes();
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.inspector/src/ru/arsysop/passage/lic/inspector/HardwareInspector.java b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/HardwareInspector.java
similarity index 74%
rename from bundles/ru.arsysop.passage.lic.inspector/src/ru/arsysop/passage/lic/inspector/HardwareInspector.java
rename to bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/HardwareInspector.java
index 0a8d296..df2d779 100644
--- a/bundles/ru.arsysop.passage.lic.inspector/src/ru/arsysop/passage/lic/inspector/HardwareInspector.java
+++ b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/HardwareInspector.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.inspector;
+package org.eclipse.passage.lic.inspector;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/RestrictionInpector.java b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/RestrictionInpector.java
new file mode 100644
index 0000000..29afa15
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.inspector/src/org/eclipse/passage/lic/inspector/RestrictionInpector.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.inspector;
+
+public interface RestrictionInpector {
+	
+	String getDefaultLevel();
+
+	Iterable<String> getSupportedLevels();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.jface/.classpath b/bundles/org.eclipse.passage.lic.jface/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/.project b/bundles/org.eclipse.passage.lic.jface/.project
similarity index 93%
rename from tests/ru.arsysop.passage.lic.bc.tests/.project
rename to bundles/org.eclipse.passage.lic.jface/.project
index bb942f8..c52cc83 100644
--- a/tests/ru.arsysop.passage.lic.bc.tests/.project
+++ b/bundles/org.eclipse.passage.lic.jface/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.bc.tests</name>
+	<name>org.eclipse.passage.lic.jface</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.json/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.jface/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.json/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.jface/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..60ede33
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.base.ui
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.jface
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.jface;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.registry;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0"
+Export-Package: org.eclipse.passage.lic.jface
diff --git a/bundles/org.eclipse.passage.lic.jface/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.jface/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..019279d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.jface
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC JFace
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.jface/build.properties b/bundles/org.eclipse.passage.lic.jface/build.properties
new file mode 100644
index 0000000..6f93480
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               icons/
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/error-c.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/error-c.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/error-c.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/error-c.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/error.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/error.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/error.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/error.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/fatal-c.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/fatal-c.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/fatal-c.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/fatal-c.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/fatal.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/fatal.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/fatal.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/fatal.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/info-c.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/info-c.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/info-c.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/info-c.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/info.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/info.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/info.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/info.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/ok-c.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/ok-c.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/ok-c.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/ok-c.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/ok.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/ok.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/ok.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/ok.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/passage.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/passage.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/passage.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/passage.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/warn-c.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/warn-c.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/warn-c.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/warn-c.png
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/warn.png b/bundles/org.eclipse.passage.lic.jface/icons/obj16/warn.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.base.ui/icons/obj16/warn.png
rename to bundles/org.eclipse.passage.lic.jface/icons/obj16/warn.png
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/ImageFinder.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/ImageFinder.java
new file mode 100644
index 0000000..96279de
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/ImageFinder.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.jface;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.Bundle;
+
+public class ImageFinder {
+
+	private static final ImageDescriptor[] NO_IMAGE_DESCRIPTORS = new ImageDescriptor[0];
+
+	public static URL getUrl(String value, Bundle definingBundle) {
+		try {
+			if (value != null) {
+				return new URL(value);
+			}
+		} catch (MalformedURLException e) {
+			if (definingBundle != null) {
+				return FileLocator.find(definingBundle, new Path(value));
+			}
+		}
+		return null;
+	}
+
+	public static List<URL> getUrls(String value, Bundle definingBundle, String separator) {
+		if (value == null) {
+			return Collections.emptyList();
+		}
+
+		StringTokenizer tokens = new StringTokenizer(value, separator);
+		List<URL> list = new ArrayList<>(10);
+		while (tokens.hasMoreTokens()) {
+			String segment = tokens.nextToken().trim();
+			URL url = getUrl(segment, definingBundle);
+			if (url != null) {
+				list.add(url);
+			}
+		}
+
+		return list;
+	}
+
+	public static ImageDescriptor getImage(String value, Bundle definingBundle) {
+		URL url = getUrl(value, definingBundle);
+		return url == null ? null : ImageDescriptor.createFromURL(url);
+	}
+
+	public static ImageDescriptor[] getImages(String value, Bundle definingBundle) {
+		List<URL> urls = getUrls(value, definingBundle, ","); //$NON-NLS-1$
+		if (urls.isEmpty()) {
+			return NO_IMAGE_DESCRIPTORS;
+		}
+		ImageDescriptor[] images = new ImageDescriptor[urls.size()];
+		for (int i = 0; i < images.length; ++i) {
+			images[i] = ImageDescriptor.createFromURL(urls.get(i));
+		}
+		return images;
+	}
+
+}
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingColors.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingColors.java
new file mode 100644
index 0000000..cc93b0d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingColors.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.jface;
+
+import org.eclipse.swt.graphics.Color;
+
+public interface LicensingColors {
+
+	String COLOR_VALIDATION_OK = "COLOR_VALIDATION_OK"; //$NON-NLS-1$
+	String COLOR_VALIDATION_ERROR = "COLOR_VALIDATION_ERROR"; //$NON-NLS-1$
+
+	Color getColor(String identifier);
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/LicensingImages.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingImages.java
similarity index 55%
rename from bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/LicensingImages.java
rename to bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingImages.java
index 15c4f7d..a309c3d 100644
--- a/bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/LicensingImages.java
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/LicensingImages.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.ui;
+package org.eclipse.passage.lic.jface;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/RestrictionVerdictLabels.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/RestrictionVerdictLabels.java
similarity index 73%
rename from bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/RestrictionVerdictLabels.java
rename to bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/RestrictionVerdictLabels.java
index 419a2a2..1243792 100644
--- a/bundles/ru.arsysop.passage.lic.base.ui/src/ru/arsysop/passage/lic/base/ui/RestrictionVerdictLabels.java
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/RestrictionVerdictLabels.java
@@ -1,34 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.ui;
+package org.eclipse.passage.lic.jface;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
-import static ru.arsysop.passage.lic.base.ui.LicensingImages.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.jface.LicensingImages.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import ru.arsysop.passage.lic.base.RestrictionVerdictComparator;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.base.RestrictionVerdictComparator;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public class RestrictionVerdictLabels {
 	
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/StatusLine.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/StatusLine.java
new file mode 100644
index 0000000..f2206a3
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/jface/StatusLine.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.jface;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.passage.lic.jface.LicensingImages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.widgets.Composite;
+
+public class StatusLine extends CLabel {
+	
+	private final LicensingImages images;
+
+	public StatusLine(Composite parent, LicensingImages images) {
+		super(parent, SWT.LEFT);
+		this.images = images;
+	}
+
+    private String computeImageKey(IStatus status) {
+    	int severity = status.getSeverity();
+    	switch (severity) {
+		case IStatus.ERROR:
+			return LicensingImages.IMG_LEVEL_ERROR;
+		case IStatus.WARNING:
+			return LicensingImages.IMG_LEVEL_WARN;
+		case IStatus.INFO:
+			return LicensingImages.IMG_LEVEL_INFO;
+		case IStatus.OK:
+			return LicensingImages.IMG_LEVEL_OK;
+		default:
+			return LicensingImages.IMG_LEVEL_WARN;
+		}
+    }
+
+    public void setStatus(IStatus status) {
+    	if (status == null) {
+    		setText(""); //$NON-NLS-1$
+    		setImage(null);
+    		return;
+		}
+    	String message = status.getMessage();
+    	if (message != null) {
+    		setText(message);
+    	} else {
+    		setText(""); //$NON-NLS-1$
+    	}
+    	setImage(images.getImage(computeImageKey(status)));
+	}
+}
diff --git a/bundles/org.eclipse.passage.lic.json/.classpath b/bundles/org.eclipse.passage.lic.json/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.json/.project b/bundles/org.eclipse.passage.lic.json/.project
new file mode 100644
index 0000000..fb56b0e
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.json</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model.core/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.json/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.core/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.json/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF
similarity index 55%
rename from bundles/ru.arsysop.passage.lic.json/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF
index aa697bb..ed8a42e 100644
--- a/bundles/ru.arsysop.passage.lic.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.json
+Automatic-Module-Name: org.eclipse.passage.lic.json
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.json
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.json
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -13,9 +13,9 @@ Require-Bundle: org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
  com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
  org.eclipse.osgi.services;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.net;bundle-version="0.0.0"
-Service-Component: OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport.xml,
- OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport.xml
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.net;bundle-version="0.0.0"
+Service-Component: OSGI-INF/org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport.xml,
+ OSGI-INF/org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: ru.arsysop.passage.lic.internal.json;x-internal:=true
+Export-Package: org.eclipse.passage.lic.internal.json;x-internal:=true
diff --git a/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..ea8b49e
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.json
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC JSON
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport.xml b/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport.xml
new file mode 100644
index 0000000..0cbf4e3
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport">
+   <implementation class="org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport"/>
+   <property name="licensing.content.type" type="String" value="application/json"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.io.FeaturePermissionTransport"/>
+   </service>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport.xml b/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport.xml
new file mode 100644
index 0000000..246d8f6
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/OSGI-INF/org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport">
+   <property name="licensing.content.type" value="application/json"/>
+   <implementation class="org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.io.LicensingConditionTransport"/>
+   </service>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.json/build.properties b/bundles/org.eclipse.passage.lic.json/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDescriptorAggregator.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDescriptorAggregator.java
new file mode 100644
index 0000000..44e8c93
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDescriptorAggregator.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.json;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+
+public class ConditionDescriptorAggregator {
+
+	private final List<BaseLicensingCondition> licensingConditions = new ArrayList<>();
+
+	public List<BaseLicensingCondition> getLicensingConditions() {
+		return licensingConditions;
+	}
+
+	public void addLicensingCondition(BaseLicensingCondition d) {
+		licensingConditions.add(d);
+	}
+
+}
diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionAggregator.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionAggregator.java
new file mode 100644
index 0000000..e94efc9
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionAggregator.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.json;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.passage.lic.base.BaseFeaturePermission;
+
+public class FeaturePermissionAggregator {
+
+	private final List<BaseFeaturePermission> featurePermissions = new ArrayList<>();
+
+	public void addFeaturePermission(BaseFeaturePermission p) {
+		featurePermissions.add(p);
+	}
+
+	public List<BaseFeaturePermission> getFeaturePermissions() {
+		return featurePermissions;
+	}
+
+}
diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionMixln.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionMixln.java
new file mode 100644
index 0000000..a5f85b1
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/FeaturePermissionMixln.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.json;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class FeaturePermissionMixln {
+
+	public FeaturePermissionMixln(@JsonProperty("featureIdentifier") String featureIdentifier,
+			@JsonProperty("matchVersion") String matchVersion, @JsonProperty("matchRule") String matchRule,
+			@JsonProperty("leaseTime") String leaseTime, @JsonProperty("expireTime") String expireTime) {
+	}
+}
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonFeaturePermissionTransport.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonFeaturePermissionTransport.java
similarity index 66%
rename from bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonFeaturePermissionTransport.java
rename to bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonFeaturePermissionTransport.java
index 41c3a6b..5d47e29 100644
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonFeaturePermissionTransport.java
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonFeaturePermissionTransport.java
@@ -1,27 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
+package org.eclipse.passage.lic.internal.json;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE_JSON;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE_JSON;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,16 +21,15 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.eclipse.passage.lic.base.BaseFeaturePermission;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.io.FeaturePermissionTransport;
 import org.osgi.service.component.annotations.Component;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
-import ru.arsysop.passage.lic.base.BaseFeaturePermission;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.io.FeaturePermissionTransport;
-
 @Component(property = { LICENSING_CONTENT_TYPE + '=' + LICENSING_CONTENT_TYPE_JSON })
 public class JsonFeaturePermissionTransport implements FeaturePermissionTransport {
 
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonLicensingConditionTransport.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonLicensingConditionTransport.java
similarity index 69%
rename from bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonLicensingConditionTransport.java
rename to bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonLicensingConditionTransport.java
index bcd1a62..329d44c 100644
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/JsonLicensingConditionTransport.java
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonLicensingConditionTransport.java
@@ -1,26 +1,18 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
+package org.eclipse.passage.lic.internal.json;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,15 +20,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.io.LicensingConditionTransport;
 import org.osgi.service.component.annotations.Component;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport;
-
 @Component(property = {LICENSING_CONTENT_TYPE + '=' + LICENSING_CONTENT_TYPE_JSON})
 public class JsonLicensingConditionTransport implements LicensingConditionTransport {
 
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/LicensingConditionMixIn.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/LicensingConditionMixIn.java
similarity index 51%
rename from bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/LicensingConditionMixIn.java
rename to bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/LicensingConditionMixIn.java
index d7d6a43..2b05584 100644
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/LicensingConditionMixIn.java
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/LicensingConditionMixIn.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
+package org.eclipse.passage.lic.internal.json;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/RequestProducer.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequestProducer.java
similarity index 82%
rename from bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/RequestProducer.java
rename to bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequestProducer.java
index 9746a4c..119adf5 100644
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/RequestProducer.java
+++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequestProducer.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
+package org.eclipse.passage.lic.internal.json;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,18 +28,17 @@
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.eclipse.passage.lic.base.BaseFeaturePermission;
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.net.LicensingRequests;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
-import ru.arsysop.passage.lic.base.BaseFeaturePermission;
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.net.LicensingRequests;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-
 public class RequestProducer {
 
 	static Logger logger = Logger.getLogger(RequestProducer.class.getName());
diff --git a/bundles/org.eclipse.passage.lic.model.core/.classpath b/bundles/org.eclipse.passage.lic.model.core/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.model.core/.project b/bundles/org.eclipse.passage.lic.model.core/.project
new file mode 100644
index 0000000..8bc4167
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.core/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.model.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.model.core/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.ecore/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.model.core/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.model.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.model.core/META-INF/MANIFEST.MF
similarity index 57%
rename from bundles/ru.arsysop.passage.lic.model.core/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.model.core/META-INF/MANIFEST.MF
index db53e08..e31435a 100644
--- a/bundles/ru.arsysop.passage.lic.model.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.model.core/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.model.core
+Automatic-Module-Name: org.eclipse.passage.lic.model.core
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.model.core
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.model.core
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -11,9 +11,9 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0",
  org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="0.0.0",
  org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model;bundle-version="0.0.0"
-Export-Package: ru.arsysop.passage.lic.model.core
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.model;bundle-version="0.0.0"
+Export-Package: org.eclipse.passage.lic.model.core
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..7b276ba
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.model.core
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Model Core
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor.xml b/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor.xml
new file mode 100644
index 0000000..d65f135
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.core/OSGI-INF/org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor">
+   <property name="licensing.content.type" value="application/xml"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.io.LicensingConditionTransport"/>
+   </service>
+   <implementation class="org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.model.core/build.properties b/bundles/org.eclipse.passage.lic.model.core/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.core/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/XmiLicensingConditionExtractor.java b/bundles/org.eclipse.passage.lic.model.core/src/org/eclipse/passage/lic/model/core/XmiLicensingConditionExtractor.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/XmiLicensingConditionExtractor.java
rename to bundles/org.eclipse.passage.lic.model.core/src/org/eclipse/passage/lic/model/core/XmiLicensingConditionExtractor.java
index 49540ad..61df5ce 100644
--- a/bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/XmiLicensingConditionExtractor.java
+++ b/bundles/org.eclipse.passage.lic.model.core/src/org/eclipse/passage/lic/model/core/XmiLicensingConditionExtractor.java
@@ -1,26 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.core;
+package org.eclipse.passage.lic.model.core;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONTENT_TYPE_XML;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,19 +27,18 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+import org.eclipse.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.registry.LicensePackDescriptor;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.io.LicensingConditionTransport;
 import org.osgi.service.component.annotations.Component;
 
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport;
-
 @Component(property = { LICENSING_CONTENT_TYPE + '=' + LICENSING_CONTENT_TYPE_XML })
 public class XmiLicensingConditionExtractor implements LicensingConditionTransport {
 	
 	public XmiLicensingConditionExtractor() {
 		EPackage.Registry.INSTANCE.put("http://www.arsysop.ru/passage/lic/0.3.1", LicPackage.eINSTANCE);
+		EPackage.Registry.INSTANCE.put("http://www.arsysop.ru/passage/lic/0.3.2", LicPackage.eINSTANCE);
 	}
 
 	@Override
@@ -56,10 +48,10 @@ public Iterable<LicensingCondition> readConditionDescriptors(InputStream input)
 		List<LicensingCondition> extracted = new ArrayList<>();
 		EList<EObject> contents = resource.getContents();
 		for (EObject eObject : contents) {
-			if (eObject instanceof LicensePack) {
-				LicensePack license = (LicensePack) eObject;
-				EList<LicenseGrant> conditions = license.getLicenseGrants();
-				extracted.addAll(conditions);
+			if (eObject instanceof LicensePackDescriptor) {
+				LicensePackDescriptor license = (LicensePackDescriptor) eObject;
+				Iterable<? extends LicensingCondition> conditions = license.getLicenseGrants();
+				conditions.forEach(extracted::add);
 			}
 		}
 		return extracted;
diff --git a/bundles/org.eclipse.passage.lic.model.ecore/.classpath b/bundles/org.eclipse.passage.lic.model.ecore/.classpath
new file mode 100644
index 0000000..075009d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.ecore/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.model.ecore/.project b/bundles/org.eclipse.passage.lic.model.ecore/.project
new file mode 100644
index 0000000..3f26630
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.ecore/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.model.ecore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.model.ecore/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.model.ecore/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.model.ecore/META-INF/MANIFEST.MF
similarity index 61%
rename from bundles/ru.arsysop.passage.lic.model.ecore/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.model.ecore/META-INF/MANIFEST.MF
index c39d1d1..1df32c1 100644
--- a/bundles/ru.arsysop.passage.lic.model.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.model.ecore/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.model.ecore
+Automatic-Module-Name: org.eclipse.passage.lic.model.ecore
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.model.ecore
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.model.ecore
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..9847866
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.model.ecore
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Model Ecore
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.model.ecore/build.properties b/bundles/org.eclipse.passage.lic.model.ecore/build.properties
new file mode 100644
index 0000000..989bdfa
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.ecore/build.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = model/,\
+               META-INF/,\
+               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/model/lic.ecore b/bundles/org.eclipse.passage.lic.model.ecore/model/lic.ecore
similarity index 92%
rename from bundles/ru.arsysop.passage.lic.model.ecore/model/lic.ecore
rename to bundles/org.eclipse.passage.lic.model.ecore/model/lic.ecore
index 804ca48..e765008 100644
--- a/bundles/ru.arsysop.passage.lic.model.ecore/model/lic.ecore
+++ b/bundles/org.eclipse.passage.lic.model.ecore/model/lic.ecore
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="lic" nsURI="http://www.arsysop.ru/passage/lic/0.3.2" nsPrefix="ru.arsysop.passage.lic">
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureSetDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.FeatureSetDescriptor"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="lic" nsURI="http://www.eclipse.org/passage/lic/0.3.3" nsPrefix="org.eclipse.passage.lic">
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureSetDescriptor" instanceClassName="org.eclipse.passage.lic.registry.FeatureSetDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.FeatureDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureDescriptor" instanceClassName="org.eclipse.passage.lic.registry.FeatureDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureVersionDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.FeatureVersionDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureVersionDescriptor" instanceClassName="org.eclipse.passage.lic.registry.FeatureVersionDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductLineDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.ProductLineDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="ProductLineDescriptor" instanceClassName="org.eclipse.passage.lic.registry.ProductLineDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.ProductDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="ProductDescriptor" instanceClassName="org.eclipse.passage.lic.registry.ProductDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.ProductVersionDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionDescriptor" instanceClassName="org.eclipse.passage.lic.registry.ProductVersionDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionFeatureDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionFeatureDescriptor" instanceClassName="org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="UserOriginDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.UserOriginDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="UserOriginDescriptor" instanceClassName="org.eclipse.passage.lic.registry.UserOriginDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="UserDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.UserDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="UserDescriptor" instanceClassName="org.eclipse.passage.lic.registry.UserDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="LicensePackDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.LicensePackDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="LicensePackDescriptor" instanceClassName="org.eclipse.passage.lic.registry.LicensePackDescriptor"
       abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="LicenseGrantDescriptor" instanceClassName="ru.arsysop.passage.lic.registry.LicenseGrantDescriptor"
+  <eClassifiers xsi:type="ecore:EClass" name="LicenseGrantDescriptor" instanceClassName="org.eclipse.passage.lic.registry.LicenseGrantDescriptor"
       abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="FeatureSet" eSuperTypes="#//FeatureSetDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
diff --git a/bundles/org.eclipse.passage.lic.model.edit/.classpath b/bundles/org.eclipse.passage.lic.model.edit/.classpath
new file mode 100644
index 0000000..ffa1ed5
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.model.edit/.project b/bundles/org.eclipse.passage.lic.model.edit/.project
new file mode 100644
index 0000000..e774e49
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.edit/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.model.edit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.model.edit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c5a8d00
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.passage.lic.model.edit;singleton:=true
+Automatic-Module-Name: org.eclipse.passage.lic.model.edit
+Bundle-Version: 0.3.3.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.passage.lic.model.edit.LicEditPlugin$Implementation$Activator
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.passage.lic.model.edit,
+ org.eclipse.passage.lic.model.edit.providers
+Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
+ org.eclipse.passage.lic.model;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport
+Import-Package: org.osgi.framework
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.model.edit/build.properties b/bundles/org.eclipse.passage.lic.model.edit/build.properties
new file mode 100644
index 0000000..35775e8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.edit/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src-gen/
+output.. = target/classes/
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/feature.png b/bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/feature.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/feature.png
rename to bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/feature.png
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/license.png b/bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/license.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/license.png
rename to bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/license.png
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/product.png b/bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/product.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/product.png
rename to bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/product.png
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/user.png b/bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/user.png
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.model.edit/icons/full/obj16/user.png
rename to bundles/org.eclipse.passage.lic.model.edit/icons/full/obj16/user.png
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/plugin.properties b/bundles/org.eclipse.passage.lic.model.edit/plugin.properties
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model.edit/plugin.properties
rename to bundles/org.eclipse.passage.lic.model.edit/plugin.properties
index a5c7e18..3cc4752 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/plugin.properties
+++ b/bundles/org.eclipse.passage.lic.model.edit/plugin.properties
@@ -1,25 +1,18 @@
-# 	Copyright (c) 2018 ArSysOp
-# 
-# 	Licensed under the Apache License, Version 2.0 (the "License");
-# 	you may not use this file except in compliance with the License.
-# 	You may obtain a copy of the License at
-# 
-# 		http://www.apache.org/licenses/LICENSE-2.0
-# 
-# 	Unless required by applicable law or agreed to in writing, software
-# 	distributed under the License is distributed on an "AS IS" BASIS,
-# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 	See the License for the specific language governing permissions and
-# 	limitations under the License.
-# 
-# 	SPDX-License-Identifier: Apache-2.0
-# 
-# 	Contributors:
-# 		ArSysOp - initial API and implementation
-# 
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
 
 pluginName = Passage LIC Model Edit Support
-providerName = ArSysOp
+providerName=Eclipse Passage
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/bundles/org.eclipse.passage.lic.model.edit/plugin.xml b/bundles/org.eclipse.passage.lic.model.edit/plugin.xml
new file mode 100644
index 0000000..87fd002
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model.edit/plugin.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated lic -->
+      <factory
+            uri="http://www.eclipse.org/passage/lic/0.3.3"
+            class="org.eclipse.passage.lic.model.edit.providers.LicItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/LicEditPlugin.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/LicEditPlugin.java
similarity index 73%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/LicEditPlugin.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/LicEditPlugin.java
index d5182c3..cd0a3b3 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/LicEditPlugin.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/LicEditPlugin.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit;
 
 import org.eclipse.emf.common.EMFPlugin;
 
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureItemProvider.java
similarity index 87%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureItemProvider.java
index 4bb3255..1b4cb2a 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,16 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.Feature;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.Feature} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.Feature} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureSetItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureSetItemProvider.java
similarity index 87%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureSetItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureSetItemProvider.java
index 54feee5..65e7242 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureSetItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureSetItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,16 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.FeatureSet;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.FeatureSet;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.FeatureSet} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.FeatureSet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureVersionItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureVersionItemProvider.java
similarity index 83%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureVersionItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureVersionItemProvider.java
index e890822..40529a1 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/FeatureVersionItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/FeatureVersionItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -40,15 +31,12 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.FeatureVersion;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.FeatureVersion;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.FeatureVersion} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.FeatureVersion} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java
similarity index 77%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java
index d56aeff..c032d6b 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicItemProviderAdapterFactory.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,8 +30,7 @@
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import ru.arsysop.passage.lic.model.util.LicAdapterFactory;
+import org.eclipse.passage.lic.model.util.LicAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -91,7 +81,7 @@ public LicItemProviderAdapterFactory() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.FeatureSet} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.FeatureSet} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -99,7 +89,7 @@ public LicItemProviderAdapterFactory() {
 	protected FeatureSetItemProvider featureSetItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.FeatureSet}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.FeatureSet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -114,7 +104,7 @@ public Adapter createFeatureSetAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.Feature} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.Feature} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -122,7 +112,7 @@ public Adapter createFeatureSetAdapter() {
 	protected FeatureItemProvider featureItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.Feature}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.Feature}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -137,7 +127,7 @@ public Adapter createFeatureAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.FeatureVersion} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.FeatureVersion} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +135,7 @@ public Adapter createFeatureAdapter() {
 	protected FeatureVersionItemProvider featureVersionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.FeatureVersion}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.FeatureVersion}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -160,7 +150,7 @@ public Adapter createFeatureVersionAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.ProductLine} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.ProductLine} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -168,7 +158,7 @@ public Adapter createFeatureVersionAdapter() {
 	protected ProductLineItemProvider productLineItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.ProductLine}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.ProductLine}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -183,7 +173,7 @@ public Adapter createProductLineAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.Product} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.Product} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,7 +181,7 @@ public Adapter createProductLineAdapter() {
 	protected ProductItemProvider productItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.Product}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.Product}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -206,7 +196,7 @@ public Adapter createProductAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.ProductVersion} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.ProductVersion} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -214,7 +204,7 @@ public Adapter createProductAdapter() {
 	protected ProductVersionItemProvider productVersionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.ProductVersion}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.ProductVersion}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -229,7 +219,7 @@ public Adapter createProductVersionAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.ProductVersionFeature} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.ProductVersionFeature} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -237,7 +227,7 @@ public Adapter createProductVersionAdapter() {
 	protected ProductVersionFeatureItemProvider productVersionFeatureItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.ProductVersionFeature}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.ProductVersionFeature}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -252,7 +242,7 @@ public Adapter createProductVersionFeatureAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.UserOrigin} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.UserOrigin} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -260,7 +250,7 @@ public Adapter createProductVersionFeatureAdapter() {
 	protected UserOriginItemProvider userOriginItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.UserOrigin}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.UserOrigin}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -275,7 +265,7 @@ public Adapter createUserOriginAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.User} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.User} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -283,7 +273,7 @@ public Adapter createUserOriginAdapter() {
 	protected UserItemProvider userItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.User}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.User}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -298,7 +288,7 @@ public Adapter createUserAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.LicensePack} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.LicensePack} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -306,7 +296,7 @@ public Adapter createUserAdapter() {
 	protected LicensePackItemProvider licensePackItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.LicensePack}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.LicensePack}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -321,7 +311,7 @@ public Adapter createLicensePackAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link ru.arsysop.passage.lic.model.api.LicenseGrant} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.passage.lic.model.api.LicenseGrant} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -329,7 +319,7 @@ public Adapter createLicensePackAdapter() {
 	protected LicenseGrantItemProvider licenseGrantItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link ru.arsysop.passage.lic.model.api.LicenseGrant}.
+	 * This creates an adapter for a {@link org.eclipse.passage.lic.model.api.LicenseGrant}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicenseGrantItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicenseGrantItemProvider.java
similarity index 91%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicenseGrantItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicenseGrantItemProvider.java
index 9ee3c69..f7b03ea 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicenseGrantItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicenseGrantItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -40,15 +31,12 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.LicenseGrant} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.LicenseGrant} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicensePackItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicensePackItemProvider.java
similarity index 89%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicensePackItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicensePackItemProvider.java
index 5be52ef..62ee136 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/LicensePackItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/LicensePackItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,16 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.LicensePack;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.LicensePack} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.LicensePack} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductItemProvider.java
similarity index 87%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductItemProvider.java
index 2a52c0e..9157c89 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,15 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.Product} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.Product} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductLineItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductLineItemProvider.java
similarity index 87%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductLineItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductLineItemProvider.java
index 95a7b50..2d60612 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductLineItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductLineItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,16 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.ProductLine;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.ProductLine;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.ProductLine} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.ProductLine} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java
index 8ad0448..1f67549 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionFeatureItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -40,15 +31,12 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.ProductVersionFeature;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.ProductVersionFeature} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.ProductVersionFeature} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionItemProvider.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionItemProvider.java
index ac5a174..c5eed40 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/ProductVersionItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/ProductVersionItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -42,16 +33,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.ProductVersion} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.ProductVersion} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserItemProvider.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserItemProvider.java
index 816e8bf..af7c609 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -40,15 +31,12 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.User;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.User;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.User} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.User} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserOriginItemProvider.java b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserOriginItemProvider.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserOriginItemProvider.java
rename to bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserOriginItemProvider.java
index 5caebb8..fac73fb 100644
--- a/bundles/ru.arsysop.passage.lic.model.edit/src-gen/ru/arsysop/passage/lic/model/edit/providers/UserOriginItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.model.edit/src-gen/org/eclipse/passage/lic/model/edit/providers/UserOriginItemProvider.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.edit.providers;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.edit.providers;
 
 
 import java.util.Collection;
@@ -40,15 +31,13 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import ru.arsysop.passage.lic.model.api.UserOrigin;
-
-import ru.arsysop.passage.lic.model.edit.LicEditPlugin;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.UserOrigin;
+import org.eclipse.passage.lic.model.edit.LicEditPlugin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
- * This is the item provider adapter for a {@link ru.arsysop.passage.lic.model.api.UserOrigin} object.
+ * This is the item provider adapter for a {@link org.eclipse.passage.lic.model.api.UserOrigin} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/bundles/org.eclipse.passage.lic.model/.classpath b/bundles/org.eclipse.passage.lic.model/.classpath
new file mode 100644
index 0000000..ffa1ed5
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>
diff --git a/tests/ru.arsysop.passage.lic.net.tests/.project b/bundles/org.eclipse.passage.lic.model/.project
similarity index 92%
rename from tests/ru.arsysop.passage.lic.net.tests/.project
rename to bundles/org.eclipse.passage.lic.model/.project
index dc3a218..a5589b3 100644
--- a/tests/ru.arsysop.passage.lic.net.tests/.project
+++ b/bundles/org.eclipse.passage.lic.model/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.net.tests</name>
+	<name>org.eclipse.passage.lic.model</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/ru.arsysop.passage.lic.net/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.model/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.net/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.model/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.model/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..747cc4f
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.model
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.model;singleton:=true
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Copyright: %pluginCopyright
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.registry;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.model.api,
+ org.eclipse.passage.lic.model.impl,
+ org.eclipse.passage.lic.model.meta,
+ org.eclipse.passage.lic.model.util
+Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.model/build.properties b/bundles/org.eclipse.passage.lic.model/build.properties
new file mode 100644
index 0000000..e4520e2
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src-gen/
+output.. = target/classes
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
diff --git a/bundles/org.eclipse.passage.lic.model/model/lic.genmodel b/bundles/org.eclipse.passage.lic.model/model/lic.genmodel
new file mode 100644
index 0000000..5b9ad0b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/model/lic.genmodel
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=""
+    modelDirectory="/org.eclipse.passage.lic.model/src-gen" creationIcons="false" editDirectory="org.eclipse.passage.lic.model.edit/src-gen"
+    editorDirectory="org.eclipse.passage.lic.model.editor/src-gen" modelPluginID="org.eclipse.passage.lic.model"
+    modelName="Lic" editPluginClass="org.eclipse.passage.lic.model.edit.LicEditPlugin"
+    editorPluginClass="org.eclipse.passage.lic.model.editor.LicEditorPlugin" nonNLSMarkers="true"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testSuiteClass="org.eclipse.passage.lic.model.tests.LicAllTests"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    editPluginID="org.eclipse.passage.lic.model.edit" editorPluginID="org.eclipse.passage.lic.model.editor"
+    language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
+    oSGiCompatible="true">
+  <foreignModel>platform:/resource/org.eclipse.passage.lic.model.ecore/model/lic.ecore</foreignModel>
+  <genPackages prefix="Lic" basePackage="org.eclipse.passage" disposableProviderFactory="true"
+      interfacePackageSuffix="model.api" metaDataPackageSuffix="model.meta" classPackageSuffix="model.impl"
+      utilityPackageSuffix="model.util" providerPackageSuffix="model.edit.providers"
+      presentationPackageSuffix="model.editor" testsPackageSuffix="model.tests" ecorePackage="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#/">
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSetDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureVersionDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLineDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeatureDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOriginDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePackDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrantDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSet">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/features"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature/description"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature/featureSet"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Feature/featureVersions"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/version"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/feature"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/news"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLine">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLine/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLine/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLine/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductLine/products"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product/description"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product/productLine"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//Product/productVersions"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/version"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/installationToken"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/secureToken"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/news"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/product"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/productVersionFeatures"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/featureIdentifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/featureVersion"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/restrictionLevel"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/productVersion"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOrigin">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/description"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/users"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User/email"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User/fullName"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User/description"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//User/userOrigin"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/issueDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/productIdentifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/productVersion"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/userIdentifier"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicensePack/licenseGrants"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/featureIdentifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/matchVersion"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/matchRule"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/validFrom"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/validUntil"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/conditionType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/conditionExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/capacity"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/licensePack"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/bundles/org.eclipse.passage.lic.model/plugin.properties b/bundles/org.eclipse.passage.lic.model/plugin.properties
new file mode 100644
index 0000000..69620a4
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/plugin.properties
@@ -0,0 +1,17 @@
+#Properties file for org.eclipse.passage.lic.runtime.model
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+pluginName = Passage LIC Model
+providerName=Eclipse Passage
+pluginCopyright = Copyright (c) 2018-2019 ArSysOp
diff --git a/bundles/org.eclipse.passage.lic.model/plugin.xml b/bundles/org.eclipse.passage.lic.model/plugin.xml
new file mode 100644
index 0000000..1619f02
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.model/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated passage -->
+      <package
+            uri="http://www.eclipse.org/passage/lic/0.3.3/"
+            class="org.eclipse.passage.lic.model.meta.LicPackage"
+            genModel="model/lic.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Feature.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Feature.java
similarity index 58%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Feature.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Feature.java
index 934627c..0aa7a6c 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Feature.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Feature.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.api;
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.FeatureDescriptor;
+import org.eclipse.passage.lic.registry.FeatureDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,15 +25,15 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Feature#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Feature#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Feature#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Feature#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature()
- * @model superTypes="ru.arsysop.passage.lic.model.api.FeatureDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature()
+ * @model superTypes="org.eclipse.passage.lic.model.api.FeatureDescriptor"
  * @generated
  */
 public interface Feature extends EObject, FeatureDescriptor {
@@ -56,14 +47,14 @@ public interface Feature extends EObject, FeatureDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature_Name()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature_Name()
 	 * @model
 	 * @generated
 	 */
   String getName();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Feature#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Feature#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -82,14 +73,14 @@ public interface Feature extends EObject, FeatureDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature_Description()
 	 * @model
 	 * @generated
 	 */
   String getDescription();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Feature#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Feature#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -100,7 +91,7 @@ public interface Feature extends EObject, FeatureDescriptor {
 
   /**
 	 * Returns the value of the '<em><b>Feature Set</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Feature Set</em>' container reference isn't clear,
@@ -109,15 +100,15 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Set</em>' container reference.
 	 * @see #setFeatureSet(FeatureSet)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature_FeatureSet()
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet#getFeatures
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature_FeatureSet()
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet#getFeatures
 	 * @model opposite="features" required="true" transient="false"
 	 * @generated
 	 */
 	FeatureSet getFeatureSet();
 
 		/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Set</em>' container reference.
@@ -128,8 +119,8 @@ public interface Feature extends EObject, FeatureDescriptor {
 
 		/**
 	 * Returns the value of the '<em><b>Feature Versions</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.FeatureVersion}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.FeatureVersion}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Feature Versions</em>' containment reference list isn't clear,
@@ -137,8 +128,8 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Versions</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature_FeatureVersions()
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature_FeatureVersions()
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion#getFeature
 	 * @model opposite="feature" containment="true"
 	 * @generated
 	 */
@@ -154,14 +145,14 @@ public interface Feature extends EObject, FeatureDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeature_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeature_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
   String getIdentifier();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureSet.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureSet.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureSet.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureSet.java
index fabdb6f..cb0485b 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureSet.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureSet.java
@@ -1,31 +1,21 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.FeatureSetDescriptor;
+import org.eclipse.passage.lic.registry.FeatureSetDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,14 +26,14 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureSet#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureSet#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureSet()
- * @model superTypes="ru.arsysop.passage.lic.model.api.FeatureSetDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureSet()
+ * @model superTypes="org.eclipse.passage.lic.model.api.FeatureSetDescriptor"
  * @generated
  */
 public interface FeatureSet extends EObject, FeatureSetDescriptor {
@@ -57,14 +47,14 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureSet_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureSet_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -83,14 +73,14 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureSet_Name()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureSet_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureSet#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -109,14 +99,14 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureSet_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureSet_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -127,8 +117,8 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Features</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.Feature}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.Feature}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features</em>' containment reference list isn't clear,
@@ -136,8 +126,8 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Features</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureSet_Features()
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getFeatureSet
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureSet_Features()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getFeatureSet
 	 * @model opposite="featureSet" containment="true"
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureVersion.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureVersion.java
similarity index 52%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureVersion.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureVersion.java
index 8319eca..b721c4a 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/FeatureVersion.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/FeatureVersion.java
@@ -1,29 +1,19 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.FeatureVersionDescriptor;
+import org.eclipse.passage.lic.registry.FeatureVersionDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,13 +24,13 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureVersion()
- * @model superTypes="ru.arsysop.passage.lic.model.api.FeatureVersionDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureVersion()
+ * @model superTypes="org.eclipse.passage.lic.model.api.FeatureVersionDescriptor"
  * @generated
  */
 public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
@@ -54,14 +44,14 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureVersion_Version()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureVersion_Version()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Version</em>' attribute.
@@ -72,7 +62,7 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Feature</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Feature</em>' container reference isn't clear,
@@ -81,15 +71,15 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature</em>' container reference.
 	 * @see #setFeature(Feature)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureVersion_Feature()
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getFeatureVersions
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureVersion_Feature()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getFeatureVersions
 	 * @model opposite="featureVersions" required="true" transient="false"
 	 * @generated
 	 */
 	Feature getFeature();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature</em>' container reference.
@@ -108,14 +98,14 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>News</em>' attribute.
 	 * @see #setNews(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getFeatureVersion_News()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getFeatureVersion_News()
 	 * @model
 	 * @generated
 	 */
 	String getNews();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>News</em>' attribute.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicenseGrant.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicenseGrant.java
similarity index 61%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicenseGrant.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicenseGrant.java
index 4f01b62..8e63555 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicenseGrant.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicenseGrant.java
@@ -1,30 +1,20 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import java.util.Date;
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.LicenseGrantDescriptor;
+import org.eclipse.passage.lic.registry.LicenseGrantDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,19 +25,19 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant()
- * @model superTypes="ru.arsysop.passage.lic.model.api.LicenseGrantDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant()
+ * @model superTypes="org.eclipse.passage.lic.model.api.LicenseGrantDescriptor"
  * @generated
  */
 public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
@@ -61,14 +51,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Identifier</em>' attribute.
 	 * @see #setFeatureIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_FeatureIdentifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_FeatureIdentifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Identifier</em>' attribute.
@@ -88,14 +78,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Match Version</em>' attribute.
 	 * @see #setMatchVersion(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_MatchVersion()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_MatchVersion()
 	 * @model default="0.0.0" required="true"
 	 * @generated
 	 */
 	String getMatchVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Match Version</em>' attribute.
@@ -114,14 +104,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Match Rule</em>' attribute.
 	 * @see #setMatchRule(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_MatchRule()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_MatchRule()
 	 * @model
 	 * @generated
 	 */
 	String getMatchRule();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Match Rule</em>' attribute.
@@ -140,14 +130,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Valid From</em>' attribute.
 	 * @see #setValidFrom(Date)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_ValidFrom()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_ValidFrom()
 	 * @model required="true"
 	 * @generated
 	 */
 	Date getValidFrom();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Valid From</em>' attribute.
@@ -166,14 +156,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Valid Until</em>' attribute.
 	 * @see #setValidUntil(Date)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_ValidUntil()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_ValidUntil()
 	 * @model required="true"
 	 * @generated
 	 */
 	Date getValidUntil();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Valid Until</em>' attribute.
@@ -192,14 +182,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Condition Type</em>' attribute.
 	 * @see #setConditionType(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_ConditionType()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_ConditionType()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getConditionType();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Condition Type</em>' attribute.
@@ -218,14 +208,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Condition Expression</em>' attribute.
 	 * @see #setConditionExpression(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_ConditionExpression()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_ConditionExpression()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getConditionExpression();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Condition Expression</em>' attribute.
@@ -245,14 +235,14 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Capacity</em>' attribute.
 	 * @see #setCapacity(int)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_Capacity()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_Capacity()
 	 * @model default="1"
 	 * @generated
 	 */
 	int getCapacity();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Capacity</em>' attribute.
@@ -263,7 +253,7 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>License Pack</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>License Pack</em>' container reference isn't clear,
@@ -272,15 +262,15 @@ public interface LicenseGrant extends EObject, LicenseGrantDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>License Pack</em>' container reference.
 	 * @see #setLicensePack(LicensePack)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicenseGrant_LicensePack()
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getLicenseGrants
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicenseGrant_LicensePack()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getLicenseGrants
 	 * @model opposite="licenseGrants" required="true" transient="false"
 	 * @generated
 	 */
 	LicensePack getLicensePack();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>License Pack</em>' container reference.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicensePack.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicensePack.java
similarity index 58%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicensePack.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicensePack.java
index 961eb1e..dd75443 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/LicensePack.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/LicensePack.java
@@ -1,32 +1,23 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import java.util.Date;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
-import ru.arsysop.passage.lic.registry.LicensePackDescriptor;
+import org.eclipse.passage.lic.registry.LicensePackDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,16 +28,16 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack()
- * @model superTypes="ru.arsysop.passage.lic.model.api.LicensePackDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack()
+ * @model superTypes="org.eclipse.passage.lic.model.api.LicensePackDescriptor"
  * @generated
  */
 public interface LicensePack extends EObject, LicensePackDescriptor {
@@ -60,14 +51,14 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_Identifier()
 	 * @model id="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -86,14 +77,14 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Issue Date</em>' attribute.
 	 * @see #setIssueDate(Date)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_IssueDate()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_IssueDate()
 	 * @model
 	 * @generated
 	 */
 	Date getIssueDate();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Issue Date</em>' attribute.
@@ -112,14 +103,14 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Identifier</em>' attribute.
 	 * @see #setProductIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_ProductIdentifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_ProductIdentifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getProductIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Product Identifier</em>' attribute.
@@ -138,14 +129,14 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Version</em>' attribute.
 	 * @see #setProductVersion(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_ProductVersion()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_ProductVersion()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getProductVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Product Version</em>' attribute.
@@ -164,14 +155,14 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>User Identifier</em>' attribute.
 	 * @see #setUserIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_UserIdentifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_UserIdentifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getUserIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>User Identifier</em>' attribute.
@@ -182,8 +173,8 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>License Grants</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.LicenseGrant}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.LicenseGrant}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>LicensePack Conditions</em>' containment reference list isn't clear,
@@ -191,8 +182,8 @@ public interface LicensePack extends EObject, LicensePackDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>License Grants</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getLicensePack_LicenseGrants()
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getLicensePack_LicenseGrants()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack
 	 * @model opposite="licensePack" containment="true"
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Product.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Product.java
similarity index 58%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Product.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Product.java
index 312c2ee..c1d346d 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/Product.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/Product.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.api;
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.ProductDescriptor;
+import org.eclipse.passage.lic.registry.ProductDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,15 +25,15 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Product#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Product#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Product#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Product#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct()
- * @model superTypes="ru.arsysop.passage.lic.model.api.ProductDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct()
+ * @model superTypes="org.eclipse.passage.lic.model.api.ProductDescriptor"
  * @generated
  */
 public interface Product extends EObject, ProductDescriptor {
@@ -56,14 +47,14 @@ public interface Product extends EObject, ProductDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
   String getIdentifier();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -82,14 +73,14 @@ public interface Product extends EObject, ProductDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct_Name()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct_Name()
 	 * @model
 	 * @generated
 	 */
   String getName();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Product#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Product#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -108,14 +99,14 @@ public interface Product extends EObject, ProductDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct_Description()
 	 * @model
 	 * @generated
 	 */
   String getDescription();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Product#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Product#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -126,7 +117,7 @@ public interface Product extends EObject, ProductDescriptor {
 
   /**
 	 * Returns the value of the '<em><b>Product Line</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product Line</em>' container reference isn't clear,
@@ -135,15 +126,15 @@ public interface Product extends EObject, ProductDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Line</em>' container reference.
 	 * @see #setProductLine(ProductLine)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct_ProductLine()
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine#getProducts
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct_ProductLine()
+	 * @see org.eclipse.passage.lic.model.api.ProductLine#getProducts
 	 * @model opposite="products" required="true" transient="false"
 	 * @generated
 	 */
 	ProductLine getProductLine();
 
 		/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Product Line</em>' container reference.
@@ -154,8 +145,8 @@ public interface Product extends EObject, ProductDescriptor {
 
 		/**
 	 * Returns the value of the '<em><b>Product Versions</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.ProductVersion}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.ProductVersion}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product Versions</em>' containment reference list isn't clear,
@@ -163,8 +154,8 @@ public interface Product extends EObject, ProductDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Versions</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProduct_ProductVersions()
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getProduct
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProduct_ProductVersions()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getProduct
 	 * @model opposite="product" containment="true"
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductLine.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductLine.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductLine.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductLine.java
index f78a7c3..6ba4559 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductLine.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductLine.java
@@ -1,31 +1,21 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.ProductLineDescriptor;
+import org.eclipse.passage.lic.registry.ProductLineDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,14 +26,14 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductLine#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductLine#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductLine()
- * @model superTypes="ru.arsysop.passage.lic.model.api.ProductLineDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductLine()
+ * @model superTypes="org.eclipse.passage.lic.model.api.ProductLineDescriptor"
  * @generated
  */
 public interface ProductLine extends EObject, ProductLineDescriptor {
@@ -57,14 +47,14 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductLine_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductLine_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -83,14 +73,14 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductLine_Name()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductLine_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductLine#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductLine#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -109,14 +99,14 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductLine_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductLine_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -127,8 +117,8 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Products</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.Product}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.Product}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Products</em>' containment reference list isn't clear,
@@ -136,8 +126,8 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Products</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductLine_Products()
-	 * @see ru.arsysop.passage.lic.model.api.Product#getProductLine
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductLine_Products()
+	 * @see org.eclipse.passage.lic.model.api.Product#getProductLine
 	 * @model opposite="productLine" containment="true"
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersion.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersion.java
similarity index 56%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersion.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersion.java
index 43a0162..7de0555 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersion.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersion.java
@@ -1,31 +1,21 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.ProductVersionDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,16 +26,16 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getNews <em>News</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getNews <em>News</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion()
- * @model superTypes="ru.arsysop.passage.lic.model.api.ProductVersionDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion()
+ * @model superTypes="org.eclipse.passage.lic.model.api.ProductVersionDescriptor"
  * @generated
  */
 public interface ProductVersion extends EObject, ProductVersionDescriptor {
@@ -59,14 +49,14 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_Version()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_Version()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Version</em>' attribute.
@@ -77,7 +67,7 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Product</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product</em>' container reference isn't clear,
@@ -86,15 +76,15 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product</em>' container reference.
 	 * @see #setProduct(Product)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_Product()
-	 * @see ru.arsysop.passage.lic.model.api.Product#getProductVersions
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_Product()
+	 * @see org.eclipse.passage.lic.model.api.Product#getProductVersions
 	 * @model opposite="productVersions" required="true" transient="false"
 	 * @generated
 	 */
 	Product getProduct();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Product</em>' container reference.
@@ -113,14 +103,14 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Installation Token</em>' attribute.
 	 * @see #setInstallationToken(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_InstallationToken()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_InstallationToken()
 	 * @model
 	 * @generated
 	 */
 	String getInstallationToken();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Installation Token</em>' attribute.
@@ -139,14 +129,14 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Secure Token</em>' attribute.
 	 * @see #setSecureToken(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_SecureToken()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_SecureToken()
 	 * @model
 	 * @generated
 	 */
 	String getSecureToken();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Secure Token</em>' attribute.
@@ -157,8 +147,8 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Product Version Features</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.ProductVersionFeature}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.ProductVersionFeature}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product Version Features</em>' containment reference list isn't clear,
@@ -166,8 +156,8 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Version Features</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_ProductVersionFeatures()
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_ProductVersionFeatures()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion
 	 * @model opposite="productVersion" containment="true"
 	 * @generated
 	 */
@@ -183,14 +173,14 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>News</em>' attribute.
 	 * @see #setNews(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersion_News()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersion_News()
 	 * @model
 	 * @generated
 	 */
 	String getNews();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getNews <em>News</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersion#getNews <em>News</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>News</em>' attribute.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersionFeature.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersionFeature.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersionFeature.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersionFeature.java
index 570cf9e..f09319a 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/ProductVersionFeature.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/ProductVersionFeature.java
@@ -1,29 +1,19 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,14 +24,14 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersionFeature()
- * @model superTypes="ru.arsysop.passage.lic.model.api.ProductVersionFeatureDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersionFeature()
+ * @model superTypes="org.eclipse.passage.lic.model.api.ProductVersionFeatureDescriptor"
  * @generated
  */
 public interface ProductVersionFeature extends EObject, ProductVersionFeatureDescriptor {
@@ -55,14 +45,14 @@ public interface ProductVersionFeature extends EObject, ProductVersionFeatureDes
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Identifier</em>' attribute.
 	 * @see #setFeatureIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersionFeature_FeatureIdentifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersionFeature_FeatureIdentifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Identifier</em>' attribute.
@@ -81,14 +71,14 @@ public interface ProductVersionFeature extends EObject, ProductVersionFeatureDes
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Version</em>' attribute.
 	 * @see #setFeatureVersion(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersionFeature_FeatureVersion()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersionFeature_FeatureVersion()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Version</em>' attribute.
@@ -107,14 +97,14 @@ public interface ProductVersionFeature extends EObject, ProductVersionFeatureDes
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Restriction Level</em>' attribute.
 	 * @see #setRestrictionLevel(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersionFeature_RestrictionLevel()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersionFeature_RestrictionLevel()
 	 * @model
 	 * @generated
 	 */
 	String getRestrictionLevel();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Restriction Level</em>' attribute.
@@ -125,7 +115,7 @@ public interface ProductVersionFeature extends EObject, ProductVersionFeatureDes
 
 	/**
 	 * Returns the value of the '<em><b>Product Version</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product Version</em>' container reference isn't clear,
@@ -134,15 +124,15 @@ public interface ProductVersionFeature extends EObject, ProductVersionFeatureDes
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Product Version</em>' container reference.
 	 * @see #setProductVersion(ProductVersion)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getProductVersionFeature_ProductVersion()
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getProductVersionFeatures
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getProductVersionFeature_ProductVersion()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getProductVersionFeatures
 	 * @model opposite="productVersionFeatures" required="true" transient="false"
 	 * @generated
 	 */
 	ProductVersion getProductVersion();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Product Version</em>' container reference.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/User.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/User.java
similarity index 60%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/User.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/User.java
index d8986c1..b80b23a 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/User.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/User.java
@@ -1,28 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.api;
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.UserDescriptor;
+import org.eclipse.passage.lic.registry.UserDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,15 +24,15 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.User#getEmail <em>Email</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.User#getFullName <em>Full Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.User#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.User#getEmail <em>Email</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.User#getFullName <em>Full Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.User#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser()
- * @model superTypes="ru.arsysop.passage.lic.model.api.UserDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser()
+ * @model superTypes="org.eclipse.passage.lic.model.api.UserDescriptor"
  * @generated
  */
 public interface User extends EObject, UserDescriptor {
@@ -55,14 +46,14 @@ public interface User extends EObject, UserDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser_Identifier()
 	 * @model
 	 * @generated
 	 */
 	String getIdentifier();
 
 		/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -81,14 +72,14 @@ public interface User extends EObject, UserDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Email</em>' attribute.
 	 * @see #setEmail(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser_Email()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser_Email()
 	 * @model required="true"
 	 * @generated
 	 */
   String getEmail();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.User#getEmail <em>Email</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.User#getEmail <em>Email</em>}' attribute.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Email</em>' attribute.
@@ -107,14 +98,14 @@ public interface User extends EObject, UserDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Full Name</em>' attribute.
 	 * @see #setFullName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser_FullName()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser_FullName()
 	 * @model
 	 * @generated
 	 */
   String getFullName();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.User#getFullName <em>Full Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.User#getFullName <em>Full Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Full Name</em>' attribute.
@@ -133,14 +124,14 @@ public interface User extends EObject, UserDescriptor {
    * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser_Description()
 	 * @model
 	 * @generated
 	 */
   String getDescription();
 
   /**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.User#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.User#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -151,7 +142,7 @@ public interface User extends EObject, UserDescriptor {
 
 		/**
 	 * Returns the value of the '<em><b>User Origin</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>User Origin</em>' reference isn't clear,
@@ -160,15 +151,15 @@ public interface User extends EObject, UserDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>User Origin</em>' container reference.
 	 * @see #setUserOrigin(UserOrigin)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUser_UserOrigin()
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin#getUsers
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUser_UserOrigin()
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin#getUsers
 	 * @model opposite="users" required="true" transient="false"
 	 * @generated
 	 */
 	UserOrigin getUserOrigin();
 
 		/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>User Origin</em>' container reference.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/UserOrigin.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/UserOrigin.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/UserOrigin.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/UserOrigin.java
index 8e4609d..78dd265 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/api/UserOrigin.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/api/UserOrigin.java
@@ -1,31 +1,21 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.api;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.api;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
-
-import ru.arsysop.passage.lic.registry.UserOriginDescriptor;
+import org.eclipse.passage.lic.registry.UserOriginDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,14 +26,14 @@
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.UserOrigin#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.UserOrigin#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}</li>
  * </ul>
  *
- * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUserOrigin()
- * @model superTypes="ru.arsysop.passage.lic.model.api.UserOriginDescriptor"
+ * @see org.eclipse.passage.lic.model.meta.LicPackage#getUserOrigin()
+ * @model superTypes="org.eclipse.passage.lic.model.api.UserOriginDescriptor"
  * @generated
  */
 public interface UserOrigin extends EObject, UserOriginDescriptor {
@@ -57,14 +47,14 @@ public interface UserOrigin extends EObject, UserOriginDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUserOrigin_Identifier()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUserOrigin_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
@@ -83,14 +73,14 @@ public interface UserOrigin extends EObject, UserOriginDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUserOrigin_Name()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUserOrigin_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.UserOrigin#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -109,14 +99,14 @@ public interface UserOrigin extends EObject, UserOriginDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUserOrigin_Description()
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUserOrigin_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -127,8 +117,8 @@ public interface UserOrigin extends EObject, UserOriginDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Users</b></em>' containment reference list.
-	 * The list contents are of type {@link ru.arsysop.passage.lic.model.api.User}.
-	 * It is bidirectional and its opposite is '{@link ru.arsysop.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}'.
+	 * The list contents are of type {@link org.eclipse.passage.lic.model.api.User}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Users</em>' reference list isn't clear,
@@ -136,8 +126,8 @@ public interface UserOrigin extends EObject, UserOriginDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Users</em>' containment reference list.
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#getUserOrigin_Users()
-	 * @see ru.arsysop.passage.lic.model.api.User#getUserOrigin
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#getUserOrigin_Users()
+	 * @see org.eclipse.passage.lic.model.api.User#getUserOrigin
 	 * @model opposite="userOrigin" containment="true"
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureImpl.java
similarity index 89%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureImpl.java
index 15de585..d25235c 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureImpl.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.impl;
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
@@ -33,10 +25,10 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.FeatureSet;
-import ru.arsysop.passage.lic.model.api.FeatureVersion;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.api.FeatureSet;
+import org.eclipse.passage.lic.model.api.FeatureVersion;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -46,11 +38,11 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureImpl#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureImpl#getFeatureSet <em>Feature Set</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureImpl#getFeatureVersions <em>Feature Versions</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureImpl#getFeatureSet <em>Feature Set</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureImpl#getFeatureVersions <em>Feature Versions</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureSetImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureSetImpl.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureSetImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureSetImpl.java
index 59a419f..9aed1cb 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureSetImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureSetImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 
@@ -36,11 +27,9 @@
 
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.FeatureSet;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.api.FeatureSet;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,10 +39,10 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl#getFeatures <em>Features</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl#getFeatures <em>Features</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureVersionImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureVersionImpl.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureVersionImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureVersionImpl.java
index a96406f..2020ca2 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/FeatureVersionImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/FeatureVersionImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -31,11 +22,9 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.FeatureVersion;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.api.FeatureVersion;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,9 +34,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureVersionImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureVersionImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.FeatureVersionImpl#getNews <em>News</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureVersionImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureVersionImpl#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.FeatureVersionImpl#getNews <em>News</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicFactoryImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicFactoryImpl.java
similarity index 85%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicFactoryImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicFactoryImpl.java
index 28e95ed..a97244a 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicFactoryImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicFactoryImpl.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.impl;
+package org.eclipse.passage.lic.model.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -27,10 +19,9 @@
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import ru.arsysop.passage.lic.model.api.*;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.*;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicPackageImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicPackageImpl.java
similarity index 95%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicPackageImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicPackageImpl.java
index d0e0dfc..d7ef202 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicPackageImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicPackageImpl.java
@@ -1,55 +1,46 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.impl;
+package org.eclipse.passage.lic.model.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.FeatureSet;
-import ru.arsysop.passage.lic.model.api.FeatureVersion;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.UserOrigin;
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.api.ProductLine;
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-import ru.arsysop.passage.lic.model.api.ProductVersionFeature;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
-import ru.arsysop.passage.lic.registry.FeatureDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureSetDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureVersionDescriptor;
-import ru.arsysop.passage.lic.registry.LicenseGrantDescriptor;
-import ru.arsysop.passage.lic.registry.LicensePackDescriptor;
-import ru.arsysop.passage.lic.registry.UserDescriptor;
-import ru.arsysop.passage.lic.registry.UserOriginDescriptor;
-import ru.arsysop.passage.lic.registry.ProductDescriptor;
-import ru.arsysop.passage.lic.registry.ProductLineDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.api.FeatureSet;
+import org.eclipse.passage.lic.model.api.FeatureVersion;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.api.ProductLine;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.api.User;
+import org.eclipse.passage.lic.model.api.UserOrigin;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.registry.FeatureDescriptor;
+import org.eclipse.passage.lic.registry.FeatureSetDescriptor;
+import org.eclipse.passage.lic.registry.FeatureVersionDescriptor;
+import org.eclipse.passage.lic.registry.LicenseGrantDescriptor;
+import org.eclipse.passage.lic.registry.LicensePackDescriptor;
+import org.eclipse.passage.lic.registry.ProductDescriptor;
+import org.eclipse.passage.lic.registry.ProductLineDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.registry.UserDescriptor;
+import org.eclipse.passage.lic.registry.UserOriginDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -223,7 +214,7 @@ public class LicPackageImpl extends EPackageImpl implements LicPackage {
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see ru.arsysop.passage.lic.model.meta.LicPackage#eNS_URI
+	 * @see org.eclipse.passage.lic.model.meta.LicPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicenseGrantImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicenseGrantImpl.java
similarity index 90%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicenseGrantImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicenseGrantImpl.java
index 57f8eec..c3922d6 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicenseGrantImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicenseGrantImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Date;
 import org.eclipse.emf.common.notify.Notification;
@@ -32,10 +23,9 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,15 +35,15 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getFeatureIdentifier <em>Feature Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getMatchVersion <em>Match Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getMatchRule <em>Match Rule</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getValidFrom <em>Valid From</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getValidUntil <em>Valid Until</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getConditionType <em>Condition Type</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getConditionExpression <em>Condition Expression</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getCapacity <em>Capacity</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl#getLicensePack <em>License Pack</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getFeatureIdentifier <em>Feature Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getMatchVersion <em>Match Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getMatchRule <em>Match Rule</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getValidFrom <em>Valid From</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getValidUntil <em>Valid Until</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getConditionType <em>Condition Type</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getConditionExpression <em>Condition Expression</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getCapacity <em>Capacity</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl#getLicensePack <em>License Pack</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicensePackImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicensePackImpl.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicensePackImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicensePackImpl.java
index b33e0a3..2d64096 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/LicensePackImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/LicensePackImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 import java.util.Date;
@@ -36,11 +27,9 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,12 +39,12 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getIssueDate <em>Issue Date</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getProductIdentifier <em>Product Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getProductVersion <em>Product Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getUserIdentifier <em>User Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl#getLicenseGrants <em>License Grants</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getIssueDate <em>Issue Date</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getProductIdentifier <em>Product Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getProductVersion <em>Product Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getUserIdentifier <em>User Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.LicensePackImpl#getLicenseGrants <em>License Grants</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductImpl.java
similarity index 89%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductImpl.java
index 1ecc85a..e7c1242 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductImpl.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.impl;
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
@@ -34,10 +26,10 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.api.ProductLine;
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.api.ProductLine;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -47,11 +39,11 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductImpl#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductImpl#getProductLine <em>Product Line</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductImpl#getProductVersions <em>Product Versions</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductImpl#getProductLine <em>Product Line</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductImpl#getProductVersions <em>Product Versions</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductLineImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductLineImpl.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductLineImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductLineImpl.java
index ec27c48..c161377 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductLineImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductLineImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 
@@ -36,11 +27,9 @@
 
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.api.ProductLine;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.api.ProductLine;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,10 +39,10 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl#getProducts <em>Products</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductLineImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductLineImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductLineImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductLineImpl#getProducts <em>Products</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionFeatureImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionFeatureImpl.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionFeatureImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionFeatureImpl.java
index cc9536d..034478f 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionFeatureImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionFeatureImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -31,11 +22,9 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-import ru.arsysop.passage.lic.model.api.ProductVersionFeature;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,10 +34,10 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl#getFeatureIdentifier <em>Feature Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl#getFeatureVersion <em>Feature Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl#getRestrictionLevel <em>Restriction Level</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl#getProductVersion <em>Product Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl#getFeatureIdentifier <em>Feature Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl#getFeatureVersion <em>Feature Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl#getRestrictionLevel <em>Restriction Level</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl#getProductVersion <em>Product Version</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionImpl.java
similarity index 88%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionImpl.java
index 5649630..95ef32b 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/ProductVersionImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/ProductVersionImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 
@@ -37,12 +28,10 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-import ru.arsysop.passage.lic.model.api.ProductVersionFeature;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -52,12 +41,12 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getInstallationToken <em>Installation Token</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getSecureToken <em>Secure Token</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getNews <em>News</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getProduct <em>Product</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl#getProductVersionFeatures <em>Product Version Features</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getInstallationToken <em>Installation Token</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getSecureToken <em>Secure Token</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getNews <em>News</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getProduct <em>Product</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl#getProductVersionFeatures <em>Product Version Features</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserImpl.java
similarity index 89%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserImpl.java
index 27b6878..618961a 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserImpl.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.impl;
+package org.eclipse.passage.lic.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,9 +22,9 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.UserOrigin;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.User;
+import org.eclipse.passage.lic.model.api.UserOrigin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,11 +34,11 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserImpl#getEmail <em>Email</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserImpl#getFullName <em>Full Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserImpl#getUserOrigin <em>User Origin</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserImpl#getEmail <em>Email</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserImpl#getFullName <em>Full Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserImpl#getUserOrigin <em>User Origin</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserOriginImpl.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserOriginImpl.java
similarity index 86%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserOriginImpl.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserOriginImpl.java
index d43eed9..55e40ac 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/impl/UserOriginImpl.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/impl/UserOriginImpl.java
@@ -1,25 +1,16 @@
-/**
- * 	Copyright (c) 2018 ArSysOp
- * 
- * 	Licensed under the Apache License, Version 2.0 (the "License");
- * 	you may not use this file except in compliance with the License.
- * 	You may obtain a copy of the License at
- * 
- * 		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * 	Unless required by applicable law or agreed to in writing, software
- * 	distributed under the License is distributed on an "AS IS" BASIS,
- * 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * 	See the License for the specific language governing permissions and
- * 	limitations under the License.
- * 
- * 	SPDX-License-Identifier: Apache-2.0
- * 
- * 	Contributors:
- * 		ArSysOp - initial API and implementation
- * 
- */
-package ru.arsysop.passage.lic.model.impl;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.model.impl;
 
 import java.util.Collection;
 
@@ -36,11 +27,9 @@
 
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.UserOrigin;
-
-import ru.arsysop.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.model.api.User;
+import org.eclipse.passage.lic.model.api.UserOrigin;
+import org.eclipse.passage.lic.model.meta.LicPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,10 +39,10 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl#getName <em>Name</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl#getUsers <em>Users</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserOriginImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserOriginImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserOriginImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.passage.lic.model.impl.UserOriginImpl#getUsers <em>Users</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicFactory.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicFactory.java
similarity index 71%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicFactory.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicFactory.java
index da7d8eb..9d1adb1 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicFactory.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicFactory.java
@@ -1,45 +1,36 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.meta;
+package org.eclipse.passage.lic.model.meta;
 
 import org.eclipse.emf.ecore.EFactory;
-
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.FeatureSet;
-import ru.arsysop.passage.lic.model.api.FeatureVersion;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.UserOrigin;
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.api.ProductLine;
-import ru.arsysop.passage.lic.model.api.ProductVersion;
-import ru.arsysop.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.api.Feature;
+import org.eclipse.passage.lic.model.api.FeatureSet;
+import org.eclipse.passage.lic.model.api.FeatureVersion;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.api.Product;
+import org.eclipse.passage.lic.model.api.ProductLine;
+import org.eclipse.passage.lic.model.api.ProductVersion;
+import org.eclipse.passage.lic.model.api.ProductVersionFeature;
+import org.eclipse.passage.lic.model.api.User;
+import org.eclipse.passage.lic.model.api.UserOrigin;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see ru.arsysop.passage.lic.model.meta.LicPackage
+ * @see org.eclipse.passage.lic.model.meta.LicPackage
  * @generated
  */
 public interface LicFactory extends EFactory {
@@ -49,7 +40,7 @@ public interface LicFactory extends EFactory {
    * <!-- end-user-doc -->
 	 * @generated
 	 */
-  LicFactory eINSTANCE = ru.arsysop.passage.lic.model.impl.LicFactoryImpl.init();
+  LicFactory eINSTANCE = org.eclipse.passage.lic.model.impl.LicFactoryImpl.init();
 
   /**
 	 * Returns a new object of class '<em>Feature Set</em>'.
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicPackage.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicPackage.java
similarity index 69%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicPackage.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicPackage.java
index d34b5c2..c54d259 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/meta/LicPackage.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/meta/LicPackage.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.meta;
+package org.eclipse.passage.lic.model.meta;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -37,7 +29,7 @@
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see ru.arsysop.passage.lic.model.meta.LicFactory
+ * @see org.eclipse.passage.lic.model.meta.LicFactory
  * @model kind="package"
  * @generated
  */
@@ -56,7 +48,7 @@ public interface LicPackage extends EPackage {
    * <!-- end-user-doc -->
 	 * @generated
 	 */
-  String eNS_URI = "http://www.arsysop.ru/passage/lic/0.3.2"; //$NON-NLS-1$
+  String eNS_URI = "http://www.eclipse.org/passage/lic/0.3.3"; //$NON-NLS-1$
 
   /**
 	 * The package namespace name.
@@ -64,7 +56,7 @@ public interface LicPackage extends EPackage {
    * <!-- end-user-doc -->
 	 * @generated
 	 */
-  String eNS_PREFIX = "ru.arsysop.passage.lic"; //$NON-NLS-1$
+  String eNS_PREFIX = "org.eclipse.passage.lic"; //$NON-NLS-1$
 
   /**
 	 * The singleton instance of the package.
@@ -72,14 +64,14 @@ public interface LicPackage extends EPackage {
    * <!-- end-user-doc -->
 	 * @generated
 	 */
-  LicPackage eINSTANCE = ru.arsysop.passage.lic.model.impl.LicPackageImpl.init();
+  LicPackage eINSTANCE = org.eclipse.passage.lic.model.impl.LicPackageImpl.init();
 
   /**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.FeatureSetDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureSetDescriptor()
+	 * @see org.eclipse.passage.lic.registry.FeatureSetDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureSetDescriptor()
 	 * @generated
 	 */
 	int FEATURE_SET_DESCRIPTOR = 0;
@@ -103,31 +95,31 @@ public interface LicPackage extends EPackage {
 	int FEATURE_SET_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.ProductDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductDescriptor()
+	 * @see org.eclipse.passage.lic.registry.ProductDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductDescriptor()
 	 * @generated
 	 */
 	int PRODUCT_DESCRIPTOR = 4;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionDescriptor()
+	 * @see org.eclipse.passage.lic.registry.ProductVersionDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionDescriptor()
 	 * @generated
 	 */
 	int PRODUCT_VERSION_DESCRIPTOR = 5;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.FeatureDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureDescriptor()
+	 * @see org.eclipse.passage.lic.registry.FeatureDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureDescriptor()
 	 * @generated
 	 */
 	int FEATURE_DESCRIPTOR = 1;
@@ -151,11 +143,11 @@ public interface LicPackage extends EPackage {
 	int FEATURE_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.FeatureVersionDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureVersionDescriptor()
+	 * @see org.eclipse.passage.lic.registry.FeatureVersionDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureVersionDescriptor()
 	 * @generated
 	 */
 	int FEATURE_VERSION_DESCRIPTOR = 2;
@@ -179,11 +171,11 @@ public interface LicPackage extends EPackage {
 	int FEATURE_VERSION_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.ProductLineDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductLineDescriptor()
+	 * @see org.eclipse.passage.lic.registry.ProductLineDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductLineDescriptor()
 	 * @generated
 	 */
 	int PRODUCT_LINE_DESCRIPTOR = 3;
@@ -243,11 +235,11 @@ public interface LicPackage extends EPackage {
 	int PRODUCT_VERSION_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionFeatureDescriptor()
+	 * @see org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionFeatureDescriptor()
 	 * @generated
 	 */
 	int PRODUCT_VERSION_FEATURE_DESCRIPTOR = 6;
@@ -271,11 +263,11 @@ public interface LicPackage extends EPackage {
 	int PRODUCT_VERSION_FEATURE_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.UserOriginDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserOriginDescriptor()
+	 * @see org.eclipse.passage.lic.registry.UserOriginDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserOriginDescriptor()
 	 * @generated
 	 */
 	int USER_ORIGIN_DESCRIPTOR = 7;
@@ -299,11 +291,11 @@ public interface LicPackage extends EPackage {
 	int USER_ORIGIN_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.UserDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserDescriptor()
+	 * @see org.eclipse.passage.lic.registry.UserDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserDescriptor()
 	 * @generated
 	 */
 	int USER_DESCRIPTOR = 8;
@@ -327,11 +319,11 @@ public interface LicPackage extends EPackage {
 	int USER_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.LicensePackDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicensePackDescriptor()
+	 * @see org.eclipse.passage.lic.registry.LicensePackDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicensePackDescriptor()
 	 * @generated
 	 */
 	int LICENSE_PACK_DESCRIPTOR = 9;
@@ -355,11 +347,11 @@ public interface LicPackage extends EPackage {
 	int LICENSE_PACK_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.registry.LicenseGrantDescriptor
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicenseGrantDescriptor()
+	 * @see org.eclipse.passage.lic.registry.LicenseGrantDescriptor
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicenseGrantDescriptor()
 	 * @generated
 	 */
 	int LICENSE_GRANT_DESCRIPTOR = 10;
@@ -383,11 +375,11 @@ public interface LicPackage extends EPackage {
 	int LICENSE_GRANT_DESCRIPTOR_OPERATION_COUNT = 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl <em>Feature Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl <em>Feature Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.FeatureSetImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureSet()
+	 * @see org.eclipse.passage.lic.model.impl.FeatureSetImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureSet()
 	 * @generated
 	 */
 	int FEATURE_SET = 11;
@@ -447,41 +439,41 @@ public interface LicPackage extends EPackage {
 	int FEATURE_SET_OPERATION_COUNT = FEATURE_SET_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.ProductImpl <em>Product</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.ProductImpl <em>Product</em>}' class.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.ProductImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProduct()
+	 * @see org.eclipse.passage.lic.model.impl.ProductImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProduct()
 	 * @generated
 	 */
   int PRODUCT = 15;
 
   /**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl <em>Product Version</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl <em>Product Version</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.ProductVersionImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersion()
+	 * @see org.eclipse.passage.lic.model.impl.ProductVersionImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersion()
 	 * @generated
 	 */
 	int PRODUCT_VERSION = 16;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl <em>Product Version Feature</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl <em>Product Version Feature</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionFeature()
+	 * @see org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionFeature()
 	 * @generated
 	 */
 	int PRODUCT_VERSION_FEATURE = 17;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.FeatureImpl <em>Feature</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.FeatureImpl <em>Feature</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.FeatureImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeature()
+	 * @see org.eclipse.passage.lic.model.impl.FeatureImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeature()
 	 * @generated
 	 */
 	int FEATURE = 12;
@@ -550,11 +542,11 @@ public interface LicPackage extends EPackage {
 	int FEATURE_OPERATION_COUNT = FEATURE_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.FeatureVersionImpl <em>Feature Version</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.FeatureVersionImpl <em>Feature Version</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.FeatureVersionImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureVersion()
+	 * @see org.eclipse.passage.lic.model.impl.FeatureVersionImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureVersion()
 	 * @generated
 	 */
 	int FEATURE_VERSION = 13;
@@ -605,11 +597,11 @@ public interface LicPackage extends EPackage {
 	int FEATURE_VERSION_OPERATION_COUNT = FEATURE_VERSION_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl <em>Product Line</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.ProductLineImpl <em>Product Line</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.ProductLineImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductLine()
+	 * @see org.eclipse.passage.lic.model.impl.ProductLineImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductLine()
 	 * @generated
 	 */
 	int PRODUCT_LINE = 14;
@@ -858,11 +850,11 @@ public interface LicPackage extends EPackage {
 	int PRODUCT_VERSION_FEATURE_OPERATION_COUNT = PRODUCT_VERSION_FEATURE_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl <em>User Origin</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.UserOriginImpl <em>User Origin</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.UserOriginImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserOrigin()
+	 * @see org.eclipse.passage.lic.model.impl.UserOriginImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserOrigin()
 	 * @generated
 	 */
 	int USER_ORIGIN = 18;
@@ -922,11 +914,11 @@ public interface LicPackage extends EPackage {
 	int USER_ORIGIN_OPERATION_COUNT = USER_ORIGIN_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.UserImpl <em>User</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.UserImpl <em>User</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.UserImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUser()
+	 * @see org.eclipse.passage.lic.model.impl.UserImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUser()
 	 * @generated
 	 */
 	int USER = 19;
@@ -995,11 +987,11 @@ public interface LicPackage extends EPackage {
 	int USER_OPERATION_COUNT = USER_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl <em>License Pack</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.LicensePackImpl <em>License Pack</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.LicensePackImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicensePack()
+	 * @see org.eclipse.passage.lic.model.impl.LicensePackImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicensePack()
 	 * @generated
 	 */
 	int LICENSE_PACK = 20;
@@ -1077,11 +1069,11 @@ public interface LicPackage extends EPackage {
 	int LICENSE_PACK_OPERATION_COUNT = LICENSE_PACK_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * The meta object id for the '{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl <em>License Grant</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl <em>License Grant</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ru.arsysop.passage.lic.model.impl.LicenseGrantImpl
-	 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicenseGrant()
+	 * @see org.eclipse.passage.lic.model.impl.LicenseGrantImpl
+	 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicenseGrant()
 	 * @generated
 	 */
 	int LICENSE_GRANT = 21;
@@ -1186,619 +1178,619 @@ public interface LicPackage extends EPackage {
 	int LICENSE_GRANT_OPERATION_COUNT = LICENSE_GRANT_DESCRIPTOR_OPERATION_COUNT + 0;
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Set Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.FeatureSetDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.FeatureSetDescriptor"
+	 * @see org.eclipse.passage.lic.registry.FeatureSetDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.FeatureSetDescriptor"
 	 * @generated
 	 */
 	EClass getFeatureSetDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.ProductDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.ProductDescriptor"
+	 * @see org.eclipse.passage.lic.registry.ProductDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.ProductDescriptor"
 	 * @generated
 	 */
 	EClass getProductDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Version Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.ProductVersionDescriptor"
+	 * @see org.eclipse.passage.lic.registry.ProductVersionDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.ProductVersionDescriptor"
 	 * @generated
 	 */
 	EClass getProductVersionDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Version Feature Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor"
+	 * @see org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor"
 	 * @generated
 	 */
 	EClass getProductVersionFeatureDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>User Origin Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.UserOriginDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.UserOriginDescriptor"
+	 * @see org.eclipse.passage.lic.registry.UserOriginDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.UserOriginDescriptor"
 	 * @generated
 	 */
 	EClass getUserOriginDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.FeatureDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.FeatureDescriptor"
+	 * @see org.eclipse.passage.lic.registry.FeatureDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.FeatureDescriptor"
 	 * @generated
 	 */
 	EClass getFeatureDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Version Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.FeatureVersionDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.FeatureVersionDescriptor"
+	 * @see org.eclipse.passage.lic.registry.FeatureVersionDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.FeatureVersionDescriptor"
 	 * @generated
 	 */
 	EClass getFeatureVersionDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Line Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.ProductLineDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.ProductLineDescriptor"
+	 * @see org.eclipse.passage.lic.registry.ProductLineDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.ProductLineDescriptor"
 	 * @generated
 	 */
 	EClass getProductLineDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>User Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.UserDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.UserDescriptor"
+	 * @see org.eclipse.passage.lic.registry.UserDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.UserDescriptor"
 	 * @generated
 	 */
 	EClass getUserDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>License Pack Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.LicensePackDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.LicensePackDescriptor"
+	 * @see org.eclipse.passage.lic.registry.LicensePackDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.LicensePackDescriptor"
 	 * @generated
 	 */
 	EClass getLicensePackDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>License Grant Descriptor</em>'.
-	 * @see ru.arsysop.passage.lic.registry.LicenseGrantDescriptor
-	 * @model instanceClass="ru.arsysop.passage.lic.registry.LicenseGrantDescriptor"
+	 * @see org.eclipse.passage.lic.registry.LicenseGrantDescriptor
+	 * @model instanceClass="org.eclipse.passage.lic.registry.LicenseGrantDescriptor"
 	 * @generated
 	 */
 	EClass getLicenseGrantDescriptor();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.FeatureSet <em>Feature Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.FeatureSet <em>Feature Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Set</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet
 	 * @generated
 	 */
 	EClass getFeatureSet();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.FeatureSet#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet#getIdentifier()
 	 * @see #getFeatureSet()
 	 * @generated
 	 */
 	EAttribute getFeatureSet_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.FeatureSet#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet#getName()
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet#getName()
 	 * @see #getFeatureSet()
 	 * @generated
 	 */
 	EAttribute getFeatureSet_Name();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.FeatureSet#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet#getDescription()
 	 * @see #getFeatureSet()
 	 * @generated
 	 */
 	EAttribute getFeatureSet_Description();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.FeatureSet#getFeatures <em>Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Features</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet#getFeatures()
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet#getFeatures()
 	 * @see #getFeatureSet()
 	 * @generated
 	 */
 	EReference getFeatureSet_Features();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.Product <em>Product</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.Product <em>Product</em>}'.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product
+	 * @see org.eclipse.passage.lic.model.api.Product
 	 * @generated
 	 */
   EClass getProduct();
 
   /**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Product#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.Product#getIdentifier()
 	 * @see #getProduct()
 	 * @generated
 	 */
   EAttribute getProduct_Identifier();
 
   /**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Product#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Product#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product#getName()
+	 * @see org.eclipse.passage.lic.model.api.Product#getName()
 	 * @see #getProduct()
 	 * @generated
 	 */
   EAttribute getProduct_Name();
 
   /**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.Feature <em>Feature</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.Feature <em>Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature
+	 * @see org.eclipse.passage.lic.model.api.Feature
 	 * @generated
 	 */
 	EClass getFeature();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Feature#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getIdentifier()
 	 * @see #getFeature()
 	 * @generated
 	 */
 	EAttribute getFeature_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Feature#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Feature#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getName()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getName()
 	 * @see #getFeature()
 	 * @generated
 	 */
 	EAttribute getFeature_Name();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Feature#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Feature#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getDescription()
 	 * @see #getFeature()
 	 * @generated
 	 */
 	EAttribute getFeature_Description();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.Feature#getFeatureSet <em>Feature Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Feature Set</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getFeatureSet()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getFeatureSet()
 	 * @see #getFeature()
 	 * @generated
 	 */
 	EReference getFeature_FeatureSet();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.Feature#getFeatureVersions <em>Feature Versions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Feature Versions</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Feature#getFeatureVersions()
+	 * @see org.eclipse.passage.lic.model.api.Feature#getFeatureVersions()
 	 * @see #getFeature()
 	 * @generated
 	 */
 	EReference getFeature_FeatureVersions();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.FeatureVersion <em>Feature Version</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.FeatureVersion <em>Feature Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion
 	 * @generated
 	 */
 	EClass getFeatureVersion();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getVersion <em>Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion#getVersion()
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion#getVersion()
 	 * @see #getFeatureVersion()
 	 * @generated
 	 */
 	EAttribute getFeatureVersion_Version();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getFeature <em>Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Feature</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion#getFeature()
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion#getFeature()
 	 * @see #getFeatureVersion()
 	 * @generated
 	 */
 	EReference getFeatureVersion_Feature();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.FeatureVersion#getNews <em>News</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>News</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion#getNews()
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion#getNews()
 	 * @see #getFeatureVersion()
 	 * @generated
 	 */
 	EAttribute getFeatureVersion_News();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.ProductLine <em>Product Line</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.ProductLine <em>Product Line</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Line</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine
+	 * @see org.eclipse.passage.lic.model.api.ProductLine
 	 * @generated
 	 */
 	EClass getProductLine();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductLine#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.ProductLine#getIdentifier()
 	 * @see #getProductLine()
 	 * @generated
 	 */
 	EAttribute getProductLine_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductLine#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductLine#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine#getName()
+	 * @see org.eclipse.passage.lic.model.api.ProductLine#getName()
 	 * @see #getProductLine()
 	 * @generated
 	 */
 	EAttribute getProductLine_Name();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductLine#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.ProductLine#getDescription()
 	 * @see #getProductLine()
 	 * @generated
 	 */
 	EAttribute getProductLine_Description();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.ProductLine#getProducts <em>Products</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Products</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine#getProducts()
+	 * @see org.eclipse.passage.lic.model.api.ProductLine#getProducts()
 	 * @see #getProductLine()
 	 * @generated
 	 */
 	EReference getProductLine_Products();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.User <em>User</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.User <em>User</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>User</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User
+	 * @see org.eclipse.passage.lic.model.api.User
 	 * @generated
 	 */
 	EClass getUser();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.User#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.User#getIdentifier()
 	 * @see #getUser()
 	 * @generated
 	 */
 	EAttribute getUser_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.User#getEmail <em>Email</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.User#getEmail <em>Email</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Email</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User#getEmail()
+	 * @see org.eclipse.passage.lic.model.api.User#getEmail()
 	 * @see #getUser()
 	 * @generated
 	 */
 	EAttribute getUser_Email();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.User#getFullName <em>Full Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.User#getFullName <em>Full Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Full Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User#getFullName()
+	 * @see org.eclipse.passage.lic.model.api.User#getFullName()
 	 * @see #getUser()
 	 * @generated
 	 */
 	EAttribute getUser_FullName();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.User#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.User#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.User#getDescription()
 	 * @see #getUser()
 	 * @generated
 	 */
 	EAttribute getUser_Description();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.User#getUserOrigin <em>User Origin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>User Origin</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.User#getUserOrigin()
+	 * @see org.eclipse.passage.lic.model.api.User#getUserOrigin()
 	 * @see #getUser()
 	 * @generated
 	 */
 	EReference getUser_UserOrigin();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.LicensePack <em>License Pack</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.LicensePack <em>License Pack</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>License Pack</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack
+	 * @see org.eclipse.passage.lic.model.api.LicensePack
 	 * @generated
 	 */
 	EClass getLicensePack();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicensePack#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getIdentifier()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EAttribute getLicensePack_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicensePack#getIssueDate <em>Issue Date</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Issue Date</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getIssueDate()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getIssueDate()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EAttribute getLicensePack_IssueDate();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicensePack#getProductIdentifier <em>Product Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Product Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getProductIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getProductIdentifier()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EAttribute getLicensePack_ProductIdentifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicensePack#getProductVersion <em>Product Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Product Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getProductVersion()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getProductVersion()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EAttribute getLicensePack_ProductVersion();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicensePack#getUserIdentifier <em>User Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>User Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getUserIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getUserIdentifier()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EAttribute getLicensePack_UserIdentifier();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.LicensePack#getLicenseGrants <em>License Grants</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>License Grants</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack#getLicenseGrants()
+	 * @see org.eclipse.passage.lic.model.api.LicensePack#getLicenseGrants()
 	 * @see #getLicensePack()
 	 * @generated
 	 */
 	EReference getLicensePack_LicenseGrants();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.LicenseGrant <em>License Grant</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.LicenseGrant <em>License Grant</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>License Grant</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant
 	 * @generated
 	 */
 	EClass getLicenseGrant();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getFeatureIdentifier <em>Feature Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getFeatureIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getFeatureIdentifier()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_FeatureIdentifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchVersion <em>Match Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Match Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchVersion()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getMatchVersion()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_MatchVersion();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getMatchRule <em>Match Rule</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Match Rule</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getMatchRule()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getMatchRule()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_MatchRule();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidFrom <em>Valid From</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Valid From</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getValidFrom()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getValidFrom()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_ValidFrom();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getValidUntil <em>Valid Until</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Valid Until</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getValidUntil()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getValidUntil()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_ValidUntil();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionType <em>Condition Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Condition Type</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionType()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getConditionType()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_ConditionType();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getConditionExpression <em>Condition Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Condition Expression</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getConditionExpression()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getConditionExpression()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_ConditionExpression();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getCapacity <em>Capacity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Capacity</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getCapacity()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getCapacity()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
 	EAttribute getLicenseGrant_Capacity();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack <em>License Pack</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>License Pack</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant#getLicensePack()
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant#getLicensePack()
 	 * @see #getLicenseGrant()
 	 * @generated
 	 */
@@ -1814,217 +1806,217 @@ public interface LicPackage extends EPackage {
 	LicFactory getLicFactory();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.Product#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.Product#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.Product#getDescription()
 	 * @see #getProduct()
 	 * @generated
 	 */
   EAttribute getProduct_Description();
 
   /**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.Product#getProductLine <em>Product Line</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Product Line</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product#getProductLine()
+	 * @see org.eclipse.passage.lic.model.api.Product#getProductLine()
 	 * @see #getProduct()
 	 * @generated
 	 */
 	EReference getProduct_ProductLine();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.Product#getProductVersions <em>Product Versions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Product Versions</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.Product#getProductVersions()
+	 * @see org.eclipse.passage.lic.model.api.Product#getProductVersions()
 	 * @see #getProduct()
 	 * @generated
 	 */
 	EReference getProduct_ProductVersions();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.ProductVersion <em>Product Version</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.ProductVersion <em>Product Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion
 	 * @generated
 	 */
 	EClass getProductVersion();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersion#getVersion <em>Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getVersion()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getVersion()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EAttribute getProductVersion_Version();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.ProductVersion#getProduct <em>Product</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Product</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getProduct()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getProduct()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EReference getProductVersion_Product();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersion#getInstallationToken <em>Installation Token</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Installation Token</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getInstallationToken()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getInstallationToken()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EAttribute getProductVersion_InstallationToken();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersion#getSecureToken <em>Secure Token</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Secure Token</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getSecureToken()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getSecureToken()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EAttribute getProductVersion_SecureToken();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.ProductVersion#getProductVersionFeatures <em>Product Version Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Product Version Features</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getProductVersionFeatures()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getProductVersionFeatures()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EReference getProductVersion_ProductVersionFeatures();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersion#getNews <em>News</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersion#getNews <em>News</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>News</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion#getNews()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion#getNews()
 	 * @see #getProductVersion()
 	 * @generated
 	 */
 	EAttribute getProductVersion_News();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature <em>Product Version Feature</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature <em>Product Version Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Product Version Feature</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature
 	 * @generated
 	 */
 	EClass getProductVersionFeature();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier <em>Feature Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureIdentifier()
 	 * @see #getProductVersionFeature()
 	 * @generated
 	 */
 	EAttribute getProductVersionFeature_FeatureIdentifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureVersion <em>Feature Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature#getFeatureVersion()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature#getFeatureVersion()
 	 * @see #getProductVersionFeature()
 	 * @generated
 	 */
 	EAttribute getProductVersionFeature_FeatureVersion();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel <em>Restriction Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Restriction Level</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature#getRestrictionLevel()
 	 * @see #getProductVersionFeature()
 	 * @generated
 	 */
 	EAttribute getProductVersionFeature_RestrictionLevel();
 
 		/**
-	 * Returns the meta object for the container reference '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion <em>Product Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Product Version</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature#getProductVersion()
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature#getProductVersion()
 	 * @see #getProductVersionFeature()
 	 * @generated
 	 */
 	EReference getProductVersionFeature_ProductVersion();
 
 		/**
-	 * Returns the meta object for class '{@link ru.arsysop.passage.lic.model.api.UserOrigin <em>User Origin</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.passage.lic.model.api.UserOrigin <em>User Origin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>User Origin</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin
 	 * @generated
 	 */
 	EClass getUserOrigin();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.UserOrigin#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin#getIdentifier()
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin#getIdentifier()
 	 * @see #getUserOrigin()
 	 * @generated
 	 */
 	EAttribute getUserOrigin_Identifier();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.UserOrigin#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin#getName()
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin#getName()
 	 * @see #getUserOrigin()
 	 * @generated
 	 */
 	EAttribute getUserOrigin_Name();
 
 		/**
-	 * Returns the meta object for the attribute '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.model.api.UserOrigin#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin#getDescription()
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin#getDescription()
 	 * @see #getUserOrigin()
 	 * @generated
 	 */
 	EAttribute getUserOrigin_Description();
 
 		/**
-	 * Returns the meta object for the containment reference list '{@link ru.arsysop.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.model.api.UserOrigin#getUsers <em>Users</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Users</em>'.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin#getUsers()
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin#getUsers()
 	 * @see #getUserOrigin()
 	 * @generated
 	 */
@@ -2045,121 +2037,121 @@ public interface LicPackage extends EPackage {
 	 */
   interface Literals {
     /**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.FeatureSetDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureSetDescriptor()
+		 * @see org.eclipse.passage.lic.registry.FeatureSetDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureSetDescriptor()
 		 * @generated
 		 */
 		EClass FEATURE_SET_DESCRIPTOR = eINSTANCE.getFeatureSetDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.ProductDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductDescriptor()
+		 * @see org.eclipse.passage.lic.registry.ProductDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductDescriptor()
 		 * @generated
 		 */
 		EClass PRODUCT_DESCRIPTOR = eINSTANCE.getProductDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.ProductVersionDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionDescriptor()
+		 * @see org.eclipse.passage.lic.registry.ProductVersionDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionDescriptor()
 		 * @generated
 		 */
 		EClass PRODUCT_VERSION_DESCRIPTOR = eINSTANCE.getProductVersionDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionFeatureDescriptor()
+		 * @see org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionFeatureDescriptor()
 		 * @generated
 		 */
 		EClass PRODUCT_VERSION_FEATURE_DESCRIPTOR = eINSTANCE.getProductVersionFeatureDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.UserOriginDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserOriginDescriptor()
+		 * @see org.eclipse.passage.lic.registry.UserOriginDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserOriginDescriptor()
 		 * @generated
 		 */
 		EClass USER_ORIGIN_DESCRIPTOR = eINSTANCE.getUserOriginDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.FeatureDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureDescriptor()
+		 * @see org.eclipse.passage.lic.registry.FeatureDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureDescriptor()
 		 * @generated
 		 */
 		EClass FEATURE_DESCRIPTOR = eINSTANCE.getFeatureDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.FeatureVersionDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureVersionDescriptor()
+		 * @see org.eclipse.passage.lic.registry.FeatureVersionDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureVersionDescriptor()
 		 * @generated
 		 */
 		EClass FEATURE_VERSION_DESCRIPTOR = eINSTANCE.getFeatureVersionDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.ProductLineDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductLineDescriptor()
+		 * @see org.eclipse.passage.lic.registry.ProductLineDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductLineDescriptor()
 		 * @generated
 		 */
 		EClass PRODUCT_LINE_DESCRIPTOR = eINSTANCE.getProductLineDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.UserDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserDescriptor()
+		 * @see org.eclipse.passage.lic.registry.UserDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserDescriptor()
 		 * @generated
 		 */
 		EClass USER_DESCRIPTOR = eINSTANCE.getUserDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.LicensePackDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicensePackDescriptor()
+		 * @see org.eclipse.passage.lic.registry.LicensePackDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicensePackDescriptor()
 		 * @generated
 		 */
 		EClass LICENSE_PACK_DESCRIPTOR = eINSTANCE.getLicensePackDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.registry.LicenseGrantDescriptor
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicenseGrantDescriptor()
+		 * @see org.eclipse.passage.lic.registry.LicenseGrantDescriptor
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicenseGrantDescriptor()
 		 * @generated
 		 */
 		EClass LICENSE_GRANT_DESCRIPTOR = eINSTANCE.getLicenseGrantDescriptor();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.FeatureSetImpl <em>Feature Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.FeatureSetImpl <em>Feature Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.FeatureSetImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureSet()
+		 * @see org.eclipse.passage.lic.model.impl.FeatureSetImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureSet()
 		 * @generated
 		 */
 		EClass FEATURE_SET = eINSTANCE.getFeatureSet();
@@ -2197,11 +2189,11 @@ interface Literals {
 		EReference FEATURE_SET__FEATURES = eINSTANCE.getFeatureSet_Features();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.ProductImpl <em>Product</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.ProductImpl <em>Product</em>}' class.
 		 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.ProductImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProduct()
+		 * @see org.eclipse.passage.lic.model.impl.ProductImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProduct()
 		 * @generated
 		 */
     EClass PRODUCT = eINSTANCE.getProduct();
@@ -2223,11 +2215,11 @@ interface Literals {
     EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name();
 
     /**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.FeatureImpl <em>Feature</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.FeatureImpl <em>Feature</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.FeatureImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeature()
+		 * @see org.eclipse.passage.lic.model.impl.FeatureImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeature()
 		 * @generated
 		 */
 		EClass FEATURE = eINSTANCE.getFeature();
@@ -2273,11 +2265,11 @@ interface Literals {
 		EReference FEATURE__FEATURE_VERSIONS = eINSTANCE.getFeature_FeatureVersions();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.FeatureVersionImpl <em>Feature Version</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.FeatureVersionImpl <em>Feature Version</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.FeatureVersionImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getFeatureVersion()
+		 * @see org.eclipse.passage.lic.model.impl.FeatureVersionImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getFeatureVersion()
 		 * @generated
 		 */
 		EClass FEATURE_VERSION = eINSTANCE.getFeatureVersion();
@@ -2307,11 +2299,11 @@ interface Literals {
 		EAttribute FEATURE_VERSION__NEWS = eINSTANCE.getFeatureVersion_News();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.ProductLineImpl <em>Product Line</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.ProductLineImpl <em>Product Line</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.ProductLineImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductLine()
+		 * @see org.eclipse.passage.lic.model.impl.ProductLineImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductLine()
 		 * @generated
 		 */
 		EClass PRODUCT_LINE = eINSTANCE.getProductLine();
@@ -2349,11 +2341,11 @@ interface Literals {
 		EReference PRODUCT_LINE__PRODUCTS = eINSTANCE.getProductLine_Products();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.UserImpl <em>User</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.UserImpl <em>User</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.UserImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUser()
+		 * @see org.eclipse.passage.lic.model.impl.UserImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUser()
 		 * @generated
 		 */
 		EClass USER = eINSTANCE.getUser();
@@ -2399,11 +2391,11 @@ interface Literals {
 		EReference USER__USER_ORIGIN = eINSTANCE.getUser_UserOrigin();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.LicensePackImpl <em>License Pack</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.LicensePackImpl <em>License Pack</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.LicensePackImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicensePack()
+		 * @see org.eclipse.passage.lic.model.impl.LicensePackImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicensePack()
 		 * @generated
 		 */
 		EClass LICENSE_PACK = eINSTANCE.getLicensePack();
@@ -2457,11 +2449,11 @@ interface Literals {
 		EReference LICENSE_PACK__LICENSE_GRANTS = eINSTANCE.getLicensePack_LicenseGrants();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.LicenseGrantImpl <em>License Grant</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.LicenseGrantImpl <em>License Grant</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.LicenseGrantImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getLicenseGrant()
+		 * @see org.eclipse.passage.lic.model.impl.LicenseGrantImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getLicenseGrant()
 		 * @generated
 		 */
 		EClass LICENSE_GRANT = eINSTANCE.getLicenseGrant();
@@ -2563,11 +2555,11 @@ interface Literals {
 		EReference PRODUCT__PRODUCT_VERSIONS = eINSTANCE.getProduct_ProductVersions();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.ProductVersionImpl <em>Product Version</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.ProductVersionImpl <em>Product Version</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.ProductVersionImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersion()
+		 * @see org.eclipse.passage.lic.model.impl.ProductVersionImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersion()
 		 * @generated
 		 */
 		EClass PRODUCT_VERSION = eINSTANCE.getProductVersion();
@@ -2621,11 +2613,11 @@ interface Literals {
 		EAttribute PRODUCT_VERSION__NEWS = eINSTANCE.getProductVersion_News();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl <em>Product Version Feature</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl <em>Product Version Feature</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.ProductVersionFeatureImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getProductVersionFeature()
+		 * @see org.eclipse.passage.lic.model.impl.ProductVersionFeatureImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getProductVersionFeature()
 		 * @generated
 		 */
 		EClass PRODUCT_VERSION_FEATURE = eINSTANCE.getProductVersionFeature();
@@ -2663,11 +2655,11 @@ interface Literals {
 		EReference PRODUCT_VERSION_FEATURE__PRODUCT_VERSION = eINSTANCE.getProductVersionFeature_ProductVersion();
 
 				/**
-		 * The meta object literal for the '{@link ru.arsysop.passage.lic.model.impl.UserOriginImpl <em>User Origin</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.passage.lic.model.impl.UserOriginImpl <em>User Origin</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ru.arsysop.passage.lic.model.impl.UserOriginImpl
-		 * @see ru.arsysop.passage.lic.model.impl.LicPackageImpl#getUserOrigin()
+		 * @see org.eclipse.passage.lic.model.impl.UserOriginImpl
+		 * @see org.eclipse.passage.lic.model.impl.LicPackageImpl#getUserOrigin()
 		 * @generated
 		 */
 		EClass USER_ORIGIN = eINSTANCE.getUserOrigin();
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicAdapterFactory.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicAdapterFactory.java
similarity index 68%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicAdapterFactory.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicAdapterFactory.java
index 5a53420..8912559 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicAdapterFactory.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicAdapterFactory.java
@@ -1,52 +1,41 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.util;
+package org.eclipse.passage.lic.model.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import ru.arsysop.passage.lic.model.api.*;
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
-import ru.arsysop.passage.lic.registry.FeatureDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureSetDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureVersionDescriptor;
-import ru.arsysop.passage.lic.registry.LicenseGrantDescriptor;
-import ru.arsysop.passage.lic.registry.LicensePackDescriptor;
-import ru.arsysop.passage.lic.registry.UserDescriptor;
-import ru.arsysop.passage.lic.registry.UserOriginDescriptor;
-import ru.arsysop.passage.lic.registry.ProductDescriptor;
-import ru.arsysop.passage.lic.registry.ProductLineDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.model.api.*;
+import org.eclipse.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.registry.FeatureDescriptor;
+import org.eclipse.passage.lic.registry.FeatureSetDescriptor;
+import org.eclipse.passage.lic.registry.FeatureVersionDescriptor;
+import org.eclipse.passage.lic.registry.LicenseGrantDescriptor;
+import org.eclipse.passage.lic.registry.LicensePackDescriptor;
+import org.eclipse.passage.lic.registry.ProductDescriptor;
+import org.eclipse.passage.lic.registry.ProductLineDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.registry.UserDescriptor;
+import org.eclipse.passage.lic.registry.UserOriginDescriptor;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see ru.arsysop.passage.lic.model.meta.LicPackage
+ * @see org.eclipse.passage.lic.model.meta.LicPackage
  * @generated
  */
 public class LicAdapterFactory extends AdapterFactoryImpl {
@@ -206,13 +195,13 @@ public Adapter createAdapter(Notifier target) {
 
 
   /**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.FeatureSetDescriptor <em>Feature Set Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.FeatureSetDescriptor
+	 * @see org.eclipse.passage.lic.registry.FeatureSetDescriptor
 	 * @generated
 	 */
 	public Adapter createFeatureSetDescriptorAdapter() {
@@ -220,13 +209,13 @@ public Adapter createFeatureSetDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.ProductDescriptor <em>Product Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.ProductDescriptor
+	 * @see org.eclipse.passage.lic.registry.ProductDescriptor
 	 * @generated
 	 */
 	public Adapter createProductDescriptorAdapter() {
@@ -234,13 +223,13 @@ public Adapter createProductDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.ProductVersionDescriptor <em>Product Version Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionDescriptor
+	 * @see org.eclipse.passage.lic.registry.ProductVersionDescriptor
 	 * @generated
 	 */
 	public Adapter createProductVersionDescriptorAdapter() {
@@ -248,13 +237,13 @@ public Adapter createProductVersionDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor <em>Product Version Feature Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor
+	 * @see org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor
 	 * @generated
 	 */
 	public Adapter createProductVersionFeatureDescriptorAdapter() {
@@ -262,13 +251,13 @@ public Adapter createProductVersionFeatureDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.UserOriginDescriptor <em>User Origin Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.UserOriginDescriptor
+	 * @see org.eclipse.passage.lic.registry.UserOriginDescriptor
 	 * @generated
 	 */
 	public Adapter createUserOriginDescriptorAdapter() {
@@ -276,13 +265,13 @@ public Adapter createUserOriginDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.FeatureDescriptor <em>Feature Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.FeatureDescriptor
+	 * @see org.eclipse.passage.lic.registry.FeatureDescriptor
 	 * @generated
 	 */
 	public Adapter createFeatureDescriptorAdapter() {
@@ -290,13 +279,13 @@ public Adapter createFeatureDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.FeatureVersionDescriptor <em>Feature Version Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.FeatureVersionDescriptor
+	 * @see org.eclipse.passage.lic.registry.FeatureVersionDescriptor
 	 * @generated
 	 */
 	public Adapter createFeatureVersionDescriptorAdapter() {
@@ -304,13 +293,13 @@ public Adapter createFeatureVersionDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.ProductLineDescriptor <em>Product Line Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.ProductLineDescriptor
+	 * @see org.eclipse.passage.lic.registry.ProductLineDescriptor
 	 * @generated
 	 */
 	public Adapter createProductLineDescriptorAdapter() {
@@ -318,13 +307,13 @@ public Adapter createProductLineDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.UserDescriptor <em>User Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.UserDescriptor
+	 * @see org.eclipse.passage.lic.registry.UserDescriptor
 	 * @generated
 	 */
 	public Adapter createUserDescriptorAdapter() {
@@ -332,13 +321,13 @@ public Adapter createUserDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.LicensePackDescriptor <em>License Pack Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.LicensePackDescriptor
+	 * @see org.eclipse.passage.lic.registry.LicensePackDescriptor
 	 * @generated
 	 */
 	public Adapter createLicensePackDescriptorAdapter() {
@@ -346,13 +335,13 @@ public Adapter createLicensePackDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.registry.LicenseGrantDescriptor <em>License Grant Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.registry.LicenseGrantDescriptor
+	 * @see org.eclipse.passage.lic.registry.LicenseGrantDescriptor
 	 * @generated
 	 */
 	public Adapter createLicenseGrantDescriptorAdapter() {
@@ -360,13 +349,13 @@ public Adapter createLicenseGrantDescriptorAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.FeatureSet <em>Feature Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.FeatureSet <em>Feature Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureSet
+	 * @see org.eclipse.passage.lic.model.api.FeatureSet
 	 * @generated
 	 */
 	public Adapter createFeatureSetAdapter() {
@@ -374,13 +363,13 @@ public Adapter createFeatureSetAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.Product <em>Product</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.Product <em>Product</em>}'.
 	 * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.Product
+	 * @see org.eclipse.passage.lic.model.api.Product
 	 * @generated
 	 */
   public Adapter createProductAdapter() {
@@ -388,13 +377,13 @@ public Adapter createProductAdapter() {
 	}
 
   /**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.ProductVersion <em>Product Version</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.ProductVersion <em>Product Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersion
+	 * @see org.eclipse.passage.lic.model.api.ProductVersion
 	 * @generated
 	 */
 	public Adapter createProductVersionAdapter() {
@@ -402,13 +391,13 @@ public Adapter createProductVersionAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.ProductVersionFeature <em>Product Version Feature</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.ProductVersionFeature <em>Product Version Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.ProductVersionFeature
+	 * @see org.eclipse.passage.lic.model.api.ProductVersionFeature
 	 * @generated
 	 */
 	public Adapter createProductVersionFeatureAdapter() {
@@ -416,13 +405,13 @@ public Adapter createProductVersionFeatureAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.UserOrigin <em>User Origin</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.UserOrigin <em>User Origin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.UserOrigin
+	 * @see org.eclipse.passage.lic.model.api.UserOrigin
 	 * @generated
 	 */
 	public Adapter createUserOriginAdapter() {
@@ -430,13 +419,13 @@ public Adapter createUserOriginAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.Feature <em>Feature</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.Feature <em>Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.Feature
+	 * @see org.eclipse.passage.lic.model.api.Feature
 	 * @generated
 	 */
 	public Adapter createFeatureAdapter() {
@@ -444,13 +433,13 @@ public Adapter createFeatureAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.FeatureVersion <em>Feature Version</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.FeatureVersion <em>Feature Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.FeatureVersion
+	 * @see org.eclipse.passage.lic.model.api.FeatureVersion
 	 * @generated
 	 */
 	public Adapter createFeatureVersionAdapter() {
@@ -458,13 +447,13 @@ public Adapter createFeatureVersionAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.ProductLine <em>Product Line</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.ProductLine <em>Product Line</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.ProductLine
+	 * @see org.eclipse.passage.lic.model.api.ProductLine
 	 * @generated
 	 */
 	public Adapter createProductLineAdapter() {
@@ -472,13 +461,13 @@ public Adapter createProductLineAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.User <em>User</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.User <em>User</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.User
+	 * @see org.eclipse.passage.lic.model.api.User
 	 * @generated
 	 */
 	public Adapter createUserAdapter() {
@@ -486,13 +475,13 @@ public Adapter createUserAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.LicensePack <em>License Pack</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.LicensePack <em>License Pack</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.LicensePack
+	 * @see org.eclipse.passage.lic.model.api.LicensePack
 	 * @generated
 	 */
 	public Adapter createLicensePackAdapter() {
@@ -500,13 +489,13 @@ public Adapter createLicensePackAdapter() {
 	}
 
 		/**
-	 * Creates a new adapter for an object of class '{@link ru.arsysop.passage.lic.model.api.LicenseGrant <em>License Grant</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.model.api.LicenseGrant <em>License Grant</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ru.arsysop.passage.lic.model.api.LicenseGrant
+	 * @see org.eclipse.passage.lic.model.api.LicenseGrant
 	 * @generated
 	 */
 	public Adapter createLicenseGrantAdapter() {
diff --git a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicSwitch.java b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicSwitch.java
similarity index 92%
rename from bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicSwitch.java
rename to bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicSwitch.java
index 739dbab..ffab247 100644
--- a/bundles/ru.arsysop.passage.lic.model/src-gen/ru/arsysop/passage/lic/model/util/LicSwitch.java
+++ b/bundles/org.eclipse.passage.lic.model/src-gen/org/eclipse/passage/lic/model/util/LicSwitch.java
@@ -1,44 +1,33 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.util;
+package org.eclipse.passage.lic.model.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import ru.arsysop.passage.lic.model.api.*;
-import ru.arsysop.passage.lic.model.api.Feature;
-import ru.arsysop.passage.lic.model.api.User;
-import ru.arsysop.passage.lic.model.api.Product;
-import ru.arsysop.passage.lic.model.meta.LicPackage;
-import ru.arsysop.passage.lic.registry.FeatureDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureSetDescriptor;
-import ru.arsysop.passage.lic.registry.FeatureVersionDescriptor;
-import ru.arsysop.passage.lic.registry.LicenseGrantDescriptor;
-import ru.arsysop.passage.lic.registry.LicensePackDescriptor;
-import ru.arsysop.passage.lic.registry.UserDescriptor;
-import ru.arsysop.passage.lic.registry.UserOriginDescriptor;
-import ru.arsysop.passage.lic.registry.ProductDescriptor;
-import ru.arsysop.passage.lic.registry.ProductLineDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionDescriptor;
-import ru.arsysop.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.model.api.*;
+import org.eclipse.passage.lic.model.meta.LicPackage;
+import org.eclipse.passage.lic.registry.FeatureDescriptor;
+import org.eclipse.passage.lic.registry.FeatureSetDescriptor;
+import org.eclipse.passage.lic.registry.FeatureVersionDescriptor;
+import org.eclipse.passage.lic.registry.LicenseGrantDescriptor;
+import org.eclipse.passage.lic.registry.LicensePackDescriptor;
+import org.eclipse.passage.lic.registry.ProductDescriptor;
+import org.eclipse.passage.lic.registry.ProductLineDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionDescriptor;
+import org.eclipse.passage.lic.registry.ProductVersionFeatureDescriptor;
+import org.eclipse.passage.lic.registry.UserDescriptor;
+import org.eclipse.passage.lic.registry.UserOriginDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +39,7 @@
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see ru.arsysop.passage.lic.model.meta.LicPackage
+ * @see org.eclipse.passage.lic.model.meta.LicPackage
  * @generated
  */
 public class LicSwitch<T> extends Switch<T> {
diff --git a/bundles/org.eclipse.passage.lic.net/.classpath b/bundles/org.eclipse.passage.lic.net/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.net/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.net/.project b/bundles/org.eclipse.passage.lic.net/.project
new file mode 100644
index 0000000..f9298b7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.net/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.net</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.oshi/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.net/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.oshi/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.net/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/ru.arsysop.passage.lic.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
similarity index 56%
rename from bundles/ru.arsysop.passage.lic.net/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
index a44f50e..6643646 100644
--- a/bundles/ru.arsysop.passage.lic.net/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.net
+Automatic-Module-Name: org.eclipse.passage.lic.net
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.net
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.net
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -11,11 +11,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0",
  org.eclipse.osgi.services;bundle-version="0.0.0",
  org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
  org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.net
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.net
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: ru.arsysop.passage.lic.internal.net;x-internal:=true,
- ru.arsysop.passage.lic.net
- 
+Export-Package: org.eclipse.passage.lic.internal.net;x-internal:=true,
+ org.eclipse.passage.lic.net
diff --git a/bundles/org.eclipse.passage.lic.net/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.net/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..6dee4e8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.net/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.net
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Net
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NetConditionMiner.xml b/bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NetConditionMiner.xml
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NetConditionMiner.xml
rename to bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NetConditionMiner.xml
index c75c237..9bce28e 100644
--- a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NetConditionMiner.xml
+++ b/bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NetConditionMiner.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.net.NetConditionMiner">
-   <implementation class="ru.arsysop.passage.lic.internal.net.NetConditionMiner"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.net.NetConditionMiner">
+   <implementation class="org.eclipse.passage.lic.internal.net.NetConditionMiner"/>
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConditionMiner"/>
+      <provide interface="org.eclipse.passage.lic.runtime.ConditionMiner"/>
    </service>
    <property name="licensing.condition.type" type="String" value="floating"/>
    <reference bind="bindEnvironmentInfo" cardinality="1..1" interface="org.eclipse.osgi.service.environment.EnvironmentInfo" name="EnvironmentInfo" policy="static" unbind="unbindEnvironmentInfo"/>
-   <reference bind="bindConditionDescriptorTransport" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport" name="ConditionDescriptorTransport" policy="dynamic" unbind="unbindConditionDescriptorTransport"/>
+   <reference bind="bindConditionDescriptorTransport" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.io.LicensingConditionTransport" name="ConditionDescriptorTransport" policy="dynamic" unbind="unbindConditionDescriptorTransport"/>
 </scr:component>
diff --git a/bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NtpConditionEvaluator.xml b/bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NtpConditionEvaluator.xml
new file mode 100644
index 0000000..3349516
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.net/OSGI-INF/org.eclipse.passage.lic.internal.net.NtpConditionEvaluator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.net.NtpConditionEvaluator">
+   <implementation class="org.eclipse.passage.lic.internal.net.NtpConditionEvaluator"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.ConditionEvaluator"/>
+   </service>
+   <property name="licensing.condition.type" type="String" value="time"/>
+</scr:component>
diff --git a/bundles/org.eclipse.passage.lic.net/build.properties b/bundles/org.eclipse.passage.lic.net/build.properties
new file mode 100644
index 0000000..3210bfe
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.net/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
diff --git a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NetConditionMiner.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetConditionMiner.java
similarity index 81%
rename from bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NetConditionMiner.java
rename to bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetConditionMiner.java
index 43d3bd4..7cfe201 100644
--- a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NetConditionMiner.java
+++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetConditionMiner.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.net;
+package org.eclipse.passage.lic.internal.net;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -44,14 +36,13 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
-
-import ru.arsysop.passage.lic.base.LicensingPaths;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.net.LicensingRequests;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
-import ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport;
+import org.eclipse.passage.lic.base.LicensingPaths;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.net.LicensingRequests;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.io.LicensingConditionTransport;
 
 public class NetConditionMiner implements ConditionMiner {
 
@@ -67,7 +58,7 @@ public class NetConditionMiner implements ConditionMiner {
 
 	private EnvironmentInfo environmentInfo;
 
-	private final Map<String, ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport> contentType2ConditionDescriptorTransport = new HashMap<>();
+	private final Map<String, org.eclipse.passage.lic.runtime.io.LicensingConditionTransport> contentType2ConditionDescriptorTransport = new HashMap<>();
 
 	private final Map<String, String> settingsMap = new HashMap<>();
 
@@ -153,7 +144,7 @@ public Iterable<LicensingCondition> handleResponse(HttpResponse response)
 					String contentType = header.getValue();
 					HttpEntity entity = response.getEntity();
 					if (entity != null && entity.getContent() != null) {
-						ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport transport = getConditionDescriptorTransport(
+						org.eclipse.passage.lic.runtime.io.LicensingConditionTransport transport = getConditionDescriptorTransport(
 								contentType);
 						Iterable<LicensingCondition> conditionDescriptors = transport
 								.readConditionDescriptors(entity.getContent());
@@ -172,7 +163,7 @@ public Iterable<LicensingCondition> handleResponse(HttpResponse response)
 		return conditions;
 	}
 
-	private ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport getConditionDescriptorTransport(
+	private org.eclipse.passage.lic.runtime.io.LicensingConditionTransport getConditionDescriptorTransport(
 			String typeOfContent) {
 		return contentType2ConditionDescriptorTransport.get(typeOfContent);
 	}
diff --git a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NtpConditionEvaluator.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NtpConditionEvaluator.java
similarity index 57%
rename from bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NtpConditionEvaluator.java
rename to bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NtpConditionEvaluator.java
index fca088e..5cfac8b 100644
--- a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/internal/net/NtpConditionEvaluator.java
+++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NtpConditionEvaluator.java
@@ -1,31 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.net;
+package org.eclipse.passage.lic.internal.net;
 
+import org.eclipse.passage.lic.base.BaseConditionEvaluator;
+import org.eclipse.passage.lic.net.TimeConditions;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.base.BaseConditionEvaluator;
-import ru.arsysop.passage.lic.net.TimeConditions;
-
 public class NtpConditionEvaluator extends BaseConditionEvaluator {
 
 	private LogService logService;
diff --git a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/LicensingRequests.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/LicensingRequests.java
similarity index 80%
rename from bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/LicensingRequests.java
rename to bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/LicensingRequests.java
index dfcc896..a13cb44 100644
--- a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/LicensingRequests.java
+++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/LicensingRequests.java
@@ -1,25 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-
-package ru.arsysop.passage.lic.net;
+package org.eclipse.passage.lic.net;
 
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -30,8 +21,7 @@
 import org.apache.http.HttpHost;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
-
-import ru.arsysop.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.base.LicensingProperties;
 
 public class LicensingRequests {
 
diff --git a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/TimeConditions.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/TimeConditions.java
similarity index 56%
rename from bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/TimeConditions.java
rename to bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/TimeConditions.java
index a334658..09aa854 100644
--- a/bundles/ru.arsysop.passage.lic.net/src/ru/arsysop/passage/lic/net/TimeConditions.java
+++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/TimeConditions.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.net;
+package org.eclipse.passage.lic.net;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
diff --git a/bundles/org.eclipse.passage.lic.oshi/.classpath b/bundles/org.eclipse.passage.lic.oshi/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.oshi/.project b/bundles/org.eclipse.passage.lic.oshi/.project
new file mode 100644
index 0000000..5e912ac
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.oshi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.runtime/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.oshi/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from bundles/ru.arsysop.passage.lic.runtime/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.oshi/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.oshi/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.oshi/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..24b6e40
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.oshi
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.oshi
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sun.jna;bundle-version="4.5.1",
+ com.sun.jna.platform;bundle-version="4.5.1",
+ org.eclipse.osgi.services;bundle-version="0.0.0",
+ org.eclipse.passage.brc.oshi;bundle-version="0.0.0",
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.inspector;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.internal.oshi;x-internal:=true,
+ org.eclipse.passage.lic.oshi
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/*.xml
diff --git a/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..957f7a4
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.oshi	
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC OSHI
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator.xml b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator.xml
similarity index 58%
rename from bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator.xml
rename to bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator.xml
index 32683c6..8714fc0 100644
--- a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator.xml
+++ b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator">
    <property name="licensing.condition.type" value="hardware"/>
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConditionEvaluator"/>
+      <provide interface="org.eclipse.passage.lic.runtime.ConditionEvaluator"/>
    </service>
    <reference bind="bindLogService" interface="org.osgi.service.log.LogService" name="LogService" unbind="unbindLogService"/>
-   <implementation class="ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator"/>
+   <implementation class="org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector.xml b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector.xml
new file mode 100644
index 0000000..8932470
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/OSGI-INF/org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector">
+   <implementation class="org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.inspector.HardwareInspector"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.passage.lic.oshi/build.properties b/bundles/org.eclipse.passage.lic.oshi/build.properties
new file mode 100644
index 0000000..33ea891
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiConditionEvaluator.java b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiConditionEvaluator.java
similarity index 56%
rename from bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiConditionEvaluator.java
rename to bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiConditionEvaluator.java
index 7c10f3a..d841b6e 100644
--- a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiConditionEvaluator.java
+++ b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiConditionEvaluator.java
@@ -1,34 +1,25 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.internal.oshi;
 
+import org.eclipse.passage.lic.base.BaseConditionEvaluator;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.base.BaseConditionEvaluator;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.oshi.OshiHal;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-
 @Component(property = {
 		LicensingProperties.LICENSING_CONDITION_TYPE + '=' + OshiHal.CONDITION_TYPE_HARDWARE })
 public class OshiConditionEvaluator extends BaseConditionEvaluator implements ConditionEvaluator {
diff --git a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiHardwareInspector.java b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiHardwareInspector.java
similarity index 51%
rename from bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiHardwareInspector.java
rename to bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiHardwareInspector.java
index afe20d8..722e844 100644
--- a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/internal/oshi/OshiHardwareInspector.java
+++ b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/OshiHardwareInspector.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.internal.oshi;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.oshi.OshiHal;
 
 public class OshiHardwareInspector implements HardwareInspector {
 
diff --git a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/oshi/OshiHal.java b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/OshiHal.java
similarity index 91%
rename from bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/oshi/OshiHal.java
rename to bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/OshiHal.java
index ad5afac..348807b 100644
--- a/bundles/ru.arsysop.passage.lic.oshi/src/ru/arsysop/passage/lic/oshi/OshiHal.java
+++ b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/OshiHal.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -26,6 +18,9 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+
 import oshi.SystemInfo;
 import oshi.hardware.Baseboard;
 import oshi.hardware.CentralProcessor;
@@ -34,8 +29,6 @@
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OperatingSystem;
 import oshi.software.os.OperatingSystemVersion;
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
 
 public class OshiHal {
 	
diff --git a/bundles/org.eclipse.passage.lic.registry/.classpath b/bundles/org.eclipse.passage.lic.registry/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/ru.arsysop.passage.lic.json.tests/.project b/bundles/org.eclipse.passage.lic.registry/.project
similarity index 92%
rename from tests/ru.arsysop.passage.lic.json.tests/.project
rename to bundles/org.eclipse.passage.lic.registry/.project
index a2f1c17..78dcf08 100644
--- a/tests/ru.arsysop.passage.lic.json.tests/.project
+++ b/bundles/org.eclipse.passage.lic.registry/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.json.tests</name>
+	<name>org.eclipse.passage.lic.registry</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/org.eclipse.passage.lic.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.registry/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..134b058
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.registry
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.registry
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.passage.lic.runtime;bundle-version="0.0.0"
+Export-Package: org.eclipse.passage.lic.registry
diff --git a/bundles/org.eclipse.passage.lic.registry/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.registry/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..5430739
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.registry
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Registry
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.registry/build.properties b/bundles/org.eclipse.passage.lic.registry/build.properties
new file mode 100644
index 0000000..25abd7a
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               OSGI-INF/,\
+               .
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/DescriptorRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/DescriptorRegistry.java
new file mode 100644
index 0000000..fead81b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/DescriptorRegistry.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface DescriptorRegistry {
+	
+	void registerSource(String source);
+
+	void unregisterSource(String source);
+	
+	Iterable<String> getSources();
+	
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureDescriptor.java
new file mode 100644
index 0000000..776e02b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureDescriptor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface FeatureDescriptor extends Identified {
+
+	String getName();
+
+	String getDescription();
+	
+	FeatureSetDescriptor getFeatureSet();
+	
+	Iterable<? extends FeatureVersionDescriptor> getFeatureVersions();
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureRegistry.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureRegistry.java
rename to bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureRegistry.java
index c6c08f4..8e3b9b9 100644
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureRegistry.java
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureRegistry.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
+package org.eclipse.passage.lic.registry;
 
 public interface FeatureRegistry extends DescriptorRegistry {
 	
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureSetDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureSetDescriptor.java
new file mode 100644
index 0000000..68053a0
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureSetDescriptor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface FeatureSetDescriptor extends Identified {
+
+	String getName();
+
+	String getDescription();
+	
+	Iterable<? extends FeatureDescriptor> getFeatures();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureVersionDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureVersionDescriptor.java
new file mode 100644
index 0000000..b26f405
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeatureVersionDescriptor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface FeatureVersionDescriptor {
+
+	public String getVersion();
+
+	public String getNews();
+
+	public FeatureDescriptor getFeature();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesEvents.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesEvents.java
new file mode 100644
index 0000000..2098657
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesEvents.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class FeaturesEvents extends RegistryEvents {
+
+	/**
+	 * Base name of all Features events
+	 */
+	public static final String FEATURES_TOPIC_BASE = "ru/arsysop/passage/lic/registry/features"; //$NON-NLS-1$
+	
+	/**
+	 * Base name of all Feature Set events
+	 */
+	public static final String FEATURE_SET_TOPIC_BASE = FEATURES_TOPIC_BASE + TOPIC_SEP + "FeatureSet"; //$NON-NLS-1$
+
+	/**
+	 * Feature Set <code>create</code> event
+	 */
+	public static final String FEATURE_SET_CREATE = FEATURE_SET_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Feature Set <code>read</code> event
+	 */
+	public static final String FEATURE_SET_READ = FEATURE_SET_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Feature Set <code>update</code> event
+	 */
+	public static final String FEATURE_SET_UPDATE = FEATURE_SET_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Feature Set <code>delete</code> event
+	 */
+	public static final String FEATURE_SET_DELETE = FEATURE_SET_TOPIC_BASE + TOPIC_SEP + DELETE;
+	
+	/**
+	 * Base name of all Feature events
+	 */
+	public static final String FEATURE_TOPIC_BASE = FEATURES_TOPIC_BASE + TOPIC_SEP + "Feature"; //$NON-NLS-1$
+
+	/**
+	 * Feature <code>create</code> event
+	 */
+	public static final String FEATURE_CREATE = FEATURE_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Feature <code>read</code> event
+	 */
+	public static final String FEATURE_READ = FEATURE_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Feature <code>update</code> event
+	 */
+	public static final String FEATURE_UPDATE = FEATURE_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Feature <code>delete</code> event
+	 */
+	public static final String FEATURE_DELETE = FEATURE_TOPIC_BASE + TOPIC_SEP + DELETE;
+	
+	/**
+	 * Base name of all Feature Version events
+	 */
+	public static final String FEATURE_VERSION_TOPIC_BASE = FEATURES_TOPIC_BASE + TOPIC_SEP + "FeatureVersion"; //$NON-NLS-1$
+
+	/**
+	 * Feature Version <code>create</code> event
+	 */
+	public static final String FEATURE_VERSION_CREATE = FEATURE_VERSION_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Feature Version <code>read</code> event
+	 */
+	public static final String FEATURE_VERSION_READ = FEATURE_VERSION_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Feature Version <code>update</code> event
+	 */
+	public static final String FEATURE_VERSION_UPDATE = FEATURE_VERSION_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Feature Version <code>delete</code> event
+	 */
+	public static final String FEATURE_VERSION_DELETE = FEATURE_VERSION_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesRegistry.java
new file mode 100644
index 0000000..697a240
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/FeaturesRegistry.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class FeaturesRegistry {
+	
+	public static final String DOMAIN_NAME = "features"; //$NON-NLS-1$
+	public static final String FILE_EXTENSION_XMI = "lic_features"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/Identified.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/Identified.java
new file mode 100644
index 0000000..cd11b3b
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/Identified.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface Identified {
+	
+	String getIdentifier();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseGrantDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseGrantDescriptor.java
new file mode 100644
index 0000000..89497d1
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseGrantDescriptor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+
+public interface LicenseGrantDescriptor extends LicensingCondition {
+
+	int getCapacity();
+	
+	LicensePackDescriptor getLicensePack();
+	
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensePackDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensePackDescriptor.java
new file mode 100644
index 0000000..8d55805
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensePackDescriptor.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface LicensePackDescriptor extends Identified {
+	
+	Iterable<? extends LicenseGrantDescriptor> getLicenseGrants();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseRegistry.java
new file mode 100644
index 0000000..251a720
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicenseRegistry.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface LicenseRegistry extends DescriptorRegistry {
+	
+	Iterable<LicensePackDescriptor> getLicensePacks();
+
+	Iterable<LicensePackDescriptor> getUserLicensePacks(String userId);
+
+	Iterable<LicensePackDescriptor> getProductVersionLicensePacks(String productId, String version);
+
+	LicensePackDescriptor getLicensePack(String licensePackId);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesEvents.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesEvents.java
new file mode 100644
index 0000000..e082d02
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesEvents.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class LicensesEvents extends RegistryEvents {
+
+	/**
+	 * Base name of all Licenses events
+	 */
+	public static final String LICENSES_TOPIC_BASE = "ru/arsysop/passage/lic/registry/licenses"; //$NON-NLS-1$
+
+	/**
+	 * Base name of all License Pack events
+	 */
+	public static final String LICENSE_PACK_TOPIC_BASE = LICENSES_TOPIC_BASE + TOPIC_SEP + "LicensePack"; //$NON-NLS-1$
+
+	/**
+	 * License Pack <code>create</code> event
+	 */
+	public static final String LICENSE_PACK_CREATE = LICENSE_PACK_TOPIC_BASE + TOPIC_SEP + CREATE;
+
+	/**
+	 * License Pack <code>read</code> event
+	 */
+	public static final String LICENSE_PACK_READ = LICENSE_PACK_TOPIC_BASE + TOPIC_SEP + READ;
+
+	/**
+	 * License Pack <code>update</code> event
+	 */
+	public static final String LICENSE_PACK_UPDATE = LICENSE_PACK_TOPIC_BASE + TOPIC_SEP + UPDATE;
+
+	/**
+	 * License Pack <code>delete</code> event
+	 */
+	public static final String LICENSE_PACK_DELETE = LICENSE_PACK_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+	/**
+	 * Base name of all License Grant events
+	 */
+	public static final String LICENSE_GRANT_TOPIC_BASE = LICENSES_TOPIC_BASE + TOPIC_SEP + "LicenseGrant"; //$NON-NLS-1$
+
+	/**
+	 * License Grant <code>create</code> event
+	 */
+	public static final String LICENSE_GRANT_CREATE = LICENSE_GRANT_TOPIC_BASE + TOPIC_SEP + CREATE;
+
+	/**
+	 * License Grant <code>read</code> event
+	 */
+	public static final String LICENSE_GRANT_READ = LICENSE_GRANT_TOPIC_BASE + TOPIC_SEP + READ;
+
+	/**
+	 * License Grant <code>update</code> event
+	 */
+	public static final String LICENSE_GRANT_UPDATE = LICENSE_GRANT_TOPIC_BASE + TOPIC_SEP + UPDATE;
+
+	/**
+	 * License Grant <code>delete</code> event
+	 */
+	public static final String LICENSE_GRANT_DELETE = LICENSE_GRANT_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesRegistry.java
new file mode 100644
index 0000000..ea3800f
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/LicensesRegistry.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class LicensesRegistry {
+	
+	public static final String DOMAIN_NAME = "licenses"; //$NON-NLS-1$
+	public static final String FILE_EXTENSION_XMI = "lic_licenses"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductDescriptor.java
new file mode 100644
index 0000000..4fb7fa8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductDescriptor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface ProductDescriptor extends Identified {
+	
+	String getName();
+	
+	String getDescription();
+
+	ProductLineDescriptor getProductLine();
+
+	Iterable<? extends ProductVersionDescriptor> getProductVersions();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductLineDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductLineDescriptor.java
new file mode 100644
index 0000000..a22d636
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductLineDescriptor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface ProductLineDescriptor extends Identified {
+
+	String getName();
+
+	String getDescription();
+	
+	Iterable<? extends ProductDescriptor> getProducts();
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductRegistry.java
similarity index 59%
rename from bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductRegistry.java
rename to bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductRegistry.java
index bb678ea..807eee8 100644
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductRegistry.java
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductRegistry.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
+package org.eclipse.passage.lic.registry;
 
 public interface ProductRegistry extends DescriptorRegistry {
 
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionDescriptor.java
new file mode 100644
index 0000000..2278e27
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionDescriptor.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface ProductVersionDescriptor {
+
+	String getVersion();
+
+	public String getNews();
+
+	String getInstallationToken();
+
+	String getSecureToken();
+	
+	ProductDescriptor getProduct();
+
+	Iterable<? extends ProductVersionFeatureDescriptor> getProductVersionFeatures();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionFeatureDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionFeatureDescriptor.java
new file mode 100644
index 0000000..15e4d53
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductVersionFeatureDescriptor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface ProductVersionFeatureDescriptor {
+
+	String getFeatureIdentifier();
+	
+	String getFeatureVersion();
+
+	String getRestrictionLevel();
+
+	ProductVersionDescriptor getProductVersion();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsEvents.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsEvents.java
new file mode 100644
index 0000000..7a6ed37
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsEvents.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class ProductsEvents extends RegistryEvents {
+
+	/**
+	 * Base name of all Products events
+	 */
+	public static final String PRODUCTS_TOPIC_BASE = "ru/arsysop/passage/lic/registry/products"; //$NON-NLS-1$
+	
+	/**
+	 * Base name of all Product Line events
+	 */
+	public static final String PRODUCT_LINE_TOPIC_BASE = PRODUCTS_TOPIC_BASE + TOPIC_SEP + "ProductLine"; //$NON-NLS-1$
+
+	/**
+	 * Product Line <code>create</code> event
+	 */
+	public static final String PRODUCT_LINE_CREATE = PRODUCT_LINE_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Product Line <code>read</code> event
+	 */
+	public static final String PRODUCT_LINE_READ = PRODUCT_LINE_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Product Line <code>update</code> event
+	 */
+	public static final String PRODUCT_LINE_UPDATE = PRODUCT_LINE_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Product Line <code>delete</code> event
+	 */
+	public static final String PRODUCT_LINE_DELETE = PRODUCT_LINE_TOPIC_BASE + TOPIC_SEP + DELETE;
+	
+	/**
+	 * Base name of all Product events
+	 */
+	public static final String PRODUCT_TOPIC_BASE = PRODUCTS_TOPIC_BASE + TOPIC_SEP + "Product"; //$NON-NLS-1$
+
+	/**
+	 * Product <code>create</code> event
+	 */
+	public static final String PRODUCT_CREATE = PRODUCT_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Product <code>read</code> event
+	 */
+	public static final String PRODUCT_READ = PRODUCT_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Product <code>update</code> event
+	 */
+	public static final String PRODUCT_UPDATE = PRODUCT_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Product <code>delete</code> event
+	 */
+	public static final String PRODUCT_DELETE = PRODUCT_TOPIC_BASE + TOPIC_SEP + DELETE;
+	
+	/**
+	 * Base name of all Product Version events
+	 */
+	public static final String PRODUCT_VERSION_TOPIC_BASE = PRODUCTS_TOPIC_BASE + TOPIC_SEP + "ProductVersion"; //$NON-NLS-1$
+
+	/**
+	 * Product Version <code>create</code> event
+	 */
+	public static final String PRODUCT_VERSION_CREATE = PRODUCT_VERSION_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Product Version <code>read</code> event
+	 */
+	public static final String PRODUCT_VERSION_READ = PRODUCT_VERSION_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Product Version <code>update</code> event
+	 */
+	public static final String PRODUCT_VERSION_UPDATE = PRODUCT_VERSION_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Product Version <code>delete</code> event
+	 */
+	public static final String PRODUCT_VERSION_DELETE = PRODUCT_VERSION_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+	/**
+	 * Base name of all Product Version Feature events
+	 */
+	public static final String PRODUCT_VERSION_FEATURE_TOPIC_BASE = PRODUCTS_TOPIC_BASE + TOPIC_SEP + "ProductVersionFeature"; //$NON-NLS-1$
+
+	/**
+	 * Product Version Feature <code>create</code> event
+	 */
+	public static final String PRODUCT_VERSION_FEATURE_CREATE = PRODUCT_VERSION_FEATURE_TOPIC_BASE + TOPIC_SEP + CREATE;
+	
+	/**
+	 * Product Version Feature <code>read</code> event
+	 */
+	public static final String PRODUCT_VERSION_FEATURE_READ = PRODUCT_VERSION_FEATURE_TOPIC_BASE + TOPIC_SEP + READ;
+	
+	/**
+	 * Product Version Feature <code>update</code> event
+	 */
+	public static final String PRODUCT_VERSION_FEATURE_UPDATE = PRODUCT_VERSION_FEATURE_TOPIC_BASE + TOPIC_SEP + UPDATE;
+	
+	/**
+	 * Product Version Feature <code>delete</code> event
+	 */
+	public static final String PRODUCT_VERSION_FEATURE_DELETE = PRODUCT_VERSION_FEATURE_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsRegistry.java
new file mode 100644
index 0000000..da91902
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/ProductsRegistry.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class ProductsRegistry {
+	
+	public static final String DOMAIN_NAME = "products"; //$NON-NLS-1$
+	public static final String FILE_EXTENSION_XMI = "lic_products"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/RegistryEvents.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/RegistryEvents.java
new file mode 100644
index 0000000..8efe39c
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/RegistryEvents.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class RegistryEvents {
+
+	/**
+	 * Topic separator character
+	 */
+	public static final String TOPIC_SEP = "/"; //$NON-NLS-1$
+
+	/**
+	 * Wild card character for matching all sub topics
+	 */
+	public static final String ALL_SUB_TOPICS = "*"; //$NON-NLS-1$
+
+
+	/**
+	 * Segment for events of type <code>create</code> 
+	 */
+	public static final String CREATE = "create"; //$NON-NLS-1$
+
+	/**
+	 * Segment for events of type <code>read</code> 
+	 */
+	public static final String READ = "read"; //$NON-NLS-1$
+
+	/**
+	 * Segment for events of type <code>update</code> 
+	 */
+	public static final String UPDATE = "update"; //$NON-NLS-1$
+
+	/**
+	 * Segment for events of type <code>delete</code> 
+	 */
+	public static final String DELETE = "delete"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserDescriptor.java
new file mode 100644
index 0000000..9245dca
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserDescriptor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface UserDescriptor extends Identified {
+	
+	String getEmail();
+
+	String getFullName();
+
+	String getDescription();
+	
+	UserOriginDescriptor getUserOrigin();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserOriginDescriptor.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserOriginDescriptor.java
new file mode 100644
index 0000000..69f210a
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserOriginDescriptor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface UserOriginDescriptor extends Identified {
+	
+	String getName();
+
+	String getDescription();
+
+	Iterable<? extends UserDescriptor> getUsers();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserRegistry.java
new file mode 100644
index 0000000..e8cddbb
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UserRegistry.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public interface UserRegistry extends DescriptorRegistry {
+
+	Iterable<UserOriginDescriptor> getUserOrigins();
+
+	UserOriginDescriptor getUserOrigin(String userOriginId);
+
+	Iterable<UserDescriptor> getUsers();
+
+	Iterable<UserDescriptor> getUsers(String userOriginId);
+
+	UserDescriptor getUser(String userId);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersEvents.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersEvents.java
new file mode 100644
index 0000000..f19dad7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersEvents.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class UsersEvents extends RegistryEvents {
+
+	/**
+	 * Base name of all Users events
+	 */
+	public static final String USERS_TOPIC_BASE = "ru/arsysop/passage/lic/registry/users"; //$NON-NLS-1$
+
+	/**
+	 * Base name of all User Origin events
+	 */
+	public static final String USER_ORIGIN_TOPIC_BASE = USERS_TOPIC_BASE + TOPIC_SEP + "UserOrigin"; //$NON-NLS-1$
+
+	/**
+	 * User Origin <code>create</code> event
+	 */
+	public static final String USER_ORIGIN_CREATE = USER_ORIGIN_TOPIC_BASE + TOPIC_SEP + CREATE;
+
+	/**
+	 * User Origin <code>read</code> event
+	 */
+	public static final String USER_ORIGIN_READ = USER_ORIGIN_TOPIC_BASE + TOPIC_SEP + READ;
+
+	/**
+	 * User Origin <code>update</code> event
+	 */
+	public static final String USER_ORIGIN_UPDATE = USER_ORIGIN_TOPIC_BASE + TOPIC_SEP + UPDATE;
+
+	/**
+	 * User Origin <code>delete</code> event
+	 */
+	public static final String USER_ORIGIN_DELETE = USER_ORIGIN_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+	/**
+	 * Base name of all User events
+	 */
+	public static final String USER_TOPIC_BASE = USERS_TOPIC_BASE + TOPIC_SEP + "User"; //$NON-NLS-1$
+
+	/**
+	 * User <code>create</code> event
+	 */
+	public static final String USER_CREATE = USER_TOPIC_BASE + TOPIC_SEP + CREATE;
+
+	/**
+	 * User <code>read</code> event
+	 */
+	public static final String USER_READ = USER_TOPIC_BASE + TOPIC_SEP + READ;
+
+	/**
+	 * User <code>update</code> event
+	 */
+	public static final String USER_UPDATE = USER_TOPIC_BASE + TOPIC_SEP + UPDATE;
+
+	/**
+	 * User <code>delete</code> event
+	 */
+	public static final String USER_DELETE = USER_TOPIC_BASE + TOPIC_SEP + DELETE;
+
+}
diff --git a/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersRegistry.java b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersRegistry.java
new file mode 100644
index 0000000..93c871e
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.registry/src/org/eclipse/passage/lic/registry/UsersRegistry.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.registry;
+
+public class UsersRegistry {
+	
+	public static final String DOMAIN_NAME = "users"; //$NON-NLS-1$
+	public static final String FILE_EXTENSION_XMI = "lic_users"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/.classpath b/bundles/org.eclipse.passage.lic.runtime/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.runtime/.project b/bundles/org.eclipse.passage.lic.runtime/.project
new file mode 100644
index 0000000..b596b81
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.runtime</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.bc.feature/.settings/org.sonarlint.eclipse.core.prefs b/bundles/org.eclipse.passage.lic.runtime/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.bc.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to bundles/org.eclipse.passage.lic.runtime/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/bundles/org.eclipse.passage.lic.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.runtime/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e52f3c0
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.runtime
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.runtime
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.passage.lic.runtime,
+ org.eclipse.passage.lic.runtime.io
diff --git a/bundles/org.eclipse.passage.lic.runtime/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.runtime/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..4330e1c
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.runtime
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Runtime
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.runtime/build.properties b/bundles/org.eclipse.passage.lic.runtime/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/AccessManager.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/AccessManager.java
similarity index 68%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/AccessManager.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/AccessManager.java
index 2667438..adc3932 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/AccessManager.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/AccessManager.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
+package org.eclipse.passage.lic.runtime;
 
 /**
  * The main entry point to the licensing
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionEvaluator.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionEvaluator.java
new file mode 100644
index 0000000..3c2681d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionEvaluator.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * Evaluates the collection of {@link LicensingCondition} to obtain a
+ * collection of {@link FeaturePermission}
+ *
+ */
+public interface ConditionEvaluator {
+
+	Iterable<FeaturePermission> evaluateConditions(Iterable<LicensingCondition> conditions, LicensingConfiguration configuration);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionMiner.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionMiner.java
new file mode 100644
index 0000000..d7bee8d
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConditionMiner.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * The miner to extract {@link LicensingCondition}(s) from different sources:
+ * <li>local file system</li>
+ * <li>network server</li>
+ * <li>etc</li>
+ */
+public interface ConditionMiner {
+
+	/**
+	 * 
+	 * @param configuration
+	 * @return
+	 */
+	Iterable<LicensingCondition> extractLicensingConditions(LicensingConfiguration configuration);
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationRequirement.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationRequirement.java
similarity index 57%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationRequirement.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationRequirement.java
index 97f820c..8db6b49 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationRequirement.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationRequirement.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
+package org.eclipse.passage.lic.runtime;
 
 /**
  * The usage constraint defined for specific feature identifier with given
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationResolver.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationResolver.java
new file mode 100644
index 0000000..ebe48ad
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/ConfigurationResolver.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * 
+ * Resolves the given configuration and produces
+ * {@link ConfigurationRequirement}(s).
+ *
+ */
+public interface ConfigurationResolver {
+
+	/**
+	 * 
+	 * @param configuration
+	 * @return
+	 */
+	Iterable<ConfigurationRequirement> resolveConfigurationRequirements(LicensingConfiguration configuration);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/FeaturePermission.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/FeaturePermission.java
new file mode 100644
index 0000000..e5a4af1
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/FeaturePermission.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+import java.util.Date;
+
+/**
+ * Permission to use the component of given name and version range obtained from
+ * {@link ConditionEvaluator} as a result of evaluation for
+ * {@link LicensingCondition}
+ */
+public interface FeaturePermission {
+
+	LicensingCondition getLicensingCondition();
+
+	LicensingConfiguration getLicensingConfiguration();
+
+	Date getLeaseDate();
+
+	Date getExpireDate();
+}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingCondition.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingCondition.java
similarity index 51%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingCondition.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingCondition.java
index ded4ce1..322c241 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingCondition.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingCondition.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
+package org.eclipse.passage.lic.runtime;
 
 import java.util.Date;
 
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingConfiguration.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingConfiguration.java
new file mode 100644
index 0000000..9346c29
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/LicensingConfiguration.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+public interface LicensingConfiguration {
+	
+	String getProductIdentifier();
+
+	String getProductVersion();
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/PermissionExaminer.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/PermissionExaminer.java
new file mode 100644
index 0000000..3353c21
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/PermissionExaminer.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * Examines how {@link FeaturePermission}(s) cover the
+ * {@link ConfigurationRequirement}(s) and produce {@link RestrictionVerdict}(s)
+ * to be consumed by {@link RestrictionExecutor}(s)
+ */
+public interface PermissionExaminer {
+
+	Iterable<RestrictionVerdict> examine(Iterable<ConfigurationRequirement> requirements,
+			Iterable<FeaturePermission> permissions);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionExecutor.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionExecutor.java
new file mode 100644
index 0000000..41a9eb3
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionExecutor.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * 
+ * Realize the {@link RestrictionVerdict}(s) for the licensed feature: 
+ * <li>early exit from command line tools with notice</li>
+ * <li>blocking dialogs for UI application</li>
+ * <li>filtering out the UI</li>
+ * <li>blocking of bundles using OSGi level</li>
+ *
+ */
+public interface RestrictionExecutor {
+
+	void execute(Iterable<RestrictionVerdict> actions);
+
+}
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionVerdict.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionVerdict.java
new file mode 100644
index 0000000..2b758c6
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/RestrictionVerdict.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime;
+
+/**
+ * 
+ * The data required to execute the permission, produced by
+ * {@link PermissionExaminer} and consumed by {@link RestrictionExecutor}
+ *
+ */
+public interface RestrictionVerdict {
+
+	ConfigurationRequirement getConfigurationRequirement();
+
+	String getRestrictionLevel();
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/FeaturePermissionTransport.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/FeaturePermissionTransport.java
similarity index 53%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/FeaturePermissionTransport.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/FeaturePermissionTransport.java
index d0d9106..f467408 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/FeaturePermissionTransport.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/FeaturePermissionTransport.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime.io;
+package org.eclipse.passage.lic.runtime.io;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
 
 /**
  * Transport interface for {@link FeaturePermission}(s)
diff --git a/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/KeyKeeper.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/KeyKeeper.java
new file mode 100644
index 0000000..47cc794
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/KeyKeeper.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.runtime.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+
+/**
+ * Provides the key required for given configuration
+ *
+ */
+public interface KeyKeeper {
+	
+	/**
+	 * 
+	 * @param configuration
+	 * @return the stream to read the key
+	 * @throws IOException
+	 */
+	
+	InputStream openKeyStream(LicensingConfiguration configuration) throws IOException;
+
+}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/LicensingConditionTransport.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/LicensingConditionTransport.java
similarity index 53%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/LicensingConditionTransport.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/LicensingConditionTransport.java
index c0da724..f154ada 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/LicensingConditionTransport.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/LicensingConditionTransport.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime.io;
+package org.eclipse.passage.lic.runtime.io;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 
 /**
  * Transport interface for {@link LicensingCondition}(s)
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/StreamCodec.java b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/StreamCodec.java
similarity index 54%
rename from bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/StreamCodec.java
rename to bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/StreamCodec.java
index f24013a..0a268c6 100644
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/StreamCodec.java
+++ b/bundles/org.eclipse.passage.lic.runtime/src/org/eclipse/passage/lic/runtime/io/StreamCodec.java
@@ -1,30 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.runtime.io;
+package org.eclipse.passage.lic.runtime.io;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
 
 /**
  * Coder and decoder for licensing data, used by {@link ConditionMiner}
diff --git a/bundles/pom.xml b/bundles/pom.xml
index a61a652..5a3d3e3 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
@@ -26,14 +18,14 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>ru.arsysop.passage.lic.bundles</artifactId>
+	<artifactId>org.eclipse.passage.lic.bundles</artifactId>
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../releng/ru.arsysop.passage.lic.parent</relativePath>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../releng/org.eclipse.passage.lic.parent</relativePath>
 	</parent>
 
 </project>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/.classpath b/bundles/ru.arsysop.passage.lic.base.ui/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.base.ui/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/.project b/bundles/ru.arsysop.passage.lic.base.ui/.project
deleted file mode 100644
index efc2318..0000000
--- a/bundles/ru.arsysop.passage.lic.base.ui/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.base.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.base.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 28a1274..0000000
--- a/bundles/ru.arsysop.passage.lic.base.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.base.ui
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.base.ui
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: ru.arsysop.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
- ru.arsysop.passage.lic.registry;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- org.eclipse.jface
-Export-Package: ru.arsysop.passage.lic.base.ui
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.base.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 6d0ca6d..0000000
--- a/bundles/ru.arsysop.passage.lic.base.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.base.ui
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Base
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.base.ui/build.properties b/bundles/ru.arsysop.passage.lic.base.ui/build.properties
deleted file mode 100644
index 969cf77..0000000
--- a/bundles/ru.arsysop.passage.lic.base.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               icons/
diff --git a/bundles/ru.arsysop.passage.lic.base/.classpath b/bundles/ru.arsysop.passage.lic.base/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.base/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.base/.project b/bundles/ru.arsysop.passage.lic.base/.project
deleted file mode 100644
index 27b10fb..0000000
--- a/bundles/ru.arsysop.passage.lic.base/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.base</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.base/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.base/META-INF/MANIFEST.MF
deleted file mode 100644
index 1da8f3e..0000000
--- a/bundles/ru.arsysop.passage.lic.base/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.runtime.base
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.base
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: ru.arsysop.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport
-Export-Package: ru.arsysop.passage.lic.base
diff --git a/bundles/ru.arsysop.passage.lic.base/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.base/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index cd1e4bd..0000000
--- a/bundles/ru.arsysop.passage.lic.base/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.base
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Base
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.base/build.properties b/bundles/ru.arsysop.passage.lic.base/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.base/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.bc/.classpath b/bundles/ru.arsysop.passage.lic.bc/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.bc/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.bc/.project b/bundles/ru.arsysop.passage.lic.bc/.project
deleted file mode 100644
index 6e2ee21..0000000
--- a/bundles/ru.arsysop.passage.lic.bc/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.bc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.bc/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.bc/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 7bbc360..0000000
--- a/bundles/ru.arsysop.passage.lic.bc/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.bc
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC BC
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.bc/build.properties b/bundles/ru.arsysop.passage.lic.bc/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.bc/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcDigest.java b/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcDigest.java
deleted file mode 100644
index fc44b94..0000000
--- a/bundles/ru.arsysop.passage.lic.bc/src/ru/arsysop/passage/lic/bc/BcDigest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.bc;
-
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-public class BcDigest {
-	
-	private BcDigest() {
-		//block
-	}
-
-	public static byte[] calculateDigest(byte[] source) {
-		final SHA512Digest dig = new SHA512Digest();
-		dig.reset();
-		dig.update(source, 0, source.length);
-		final byte[] digest = new byte[dig.getDigestSize()];
-		dig.doFinal(digest, 0);
-		return digest;
-	}
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.equinox/.classpath b/bundles/ru.arsysop.passage.lic.equinox/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.equinox/.project b/bundles/ru.arsysop.passage.lic.equinox/.project
deleted file mode 100644
index 2e14325..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.equinox</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.equinox/META-INF/p2.inf b/bundles/ru.arsysop.passage.lic.equinox/META-INF/p2.inf
deleted file mode 100644
index a90bb95..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/META-INF/p2.inf
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-provides.0.namespace = licensing.management
-provides.0.name = equinox
-provides.0.version = 0.3.2
diff --git a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 966a7ef..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.equinox
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Equinox
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.BundleCapabilityResolver.xml b/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.BundleCapabilityResolver.xml
deleted file mode 100644
index f996e31..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.BundleCapabilityResolver.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="ru.arsysop.passage.lic.internal.equinox.BundleCapabilityResolver">
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConfigurationResolver"/>
-   </service>
-   <implementation class="ru.arsysop.passage.lic.internal.equinox.BundleCapabilityResolver"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager.xml b/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager.xml
deleted file mode 100644
index eb24ac8..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/OSGI-INF/ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager">
-   <implementation class="ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.AccessManager"/>
-   </service>
-   <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
-   <reference bind="bindLogService" cardinality="1..1" interface="org.osgi.service.log.LogService" name="LogService" policy="static" unbind="unbindLogService"/>
-   <reference bind="bindConfigurationResolver" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.ConfigurationResolver" name="ConfigurationResolver" policy="static" unbind="unbindConfigurationResolver"/>
-   <reference bind="bindConditionMiner" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.ConditionMiner" name="ConditionMiner" policy="static" unbind="unbindConditionMiner"/>
-   <reference bind="bindConditionEvaluator" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.ConditionEvaluator" name="ConditionEvaluator" policy="static" unbind="unbindConditionEvaluator"/>
-   <reference bind="bindPermissionExaminer" cardinality="1..1" interface="ru.arsysop.passage.lic.runtime.PermissionExaminer" name="PermissionExaminer" policy="static" unbind="unbindPermissionExaminer"/>
-   <reference bind="bindRestrictionExecutor" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.RestrictionExecutor" name="RestrictionExecutor" policy="static" unbind="unbindRestrictionExecutor"/>
-</scr:component>
diff --git a/bundles/ru.arsysop.passage.lic.equinox/build.properties b/bundles/ru.arsysop.passage.lic.equinox/build.properties
deleted file mode 100644
index 755ea8c..0000000
--- a/bundles/ru.arsysop.passage.lic.equinox/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/.classpath b/bundles/ru.arsysop.passage.lic.inspector.ui/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.inspector.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7738309..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: ru.arsysop.passage.lic.inspector.ui
-Bundle-Version: 0.3.2.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.osgi.services;bundle-version="0.0.0",
- org.eclipse.e4.core.di,
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base.ui;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model.edit;bundle-version="0.0.0",
- ru.arsysop.passage.lic.inspector;bundle-version="0.0.0"
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: ru.arsysop.passage.lic.inspector.ui
-Import-Package: javax.inject;version="1.0.0"
-Export-Package: ru.arsysop.passage.lic.inspector.ui.dialogs,
- ru.arsysop.passage.lic.inspector.ui.hadlers
-Service-Component: OSGI-INF/ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 985f348..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.inspector.ui
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Inspector UI
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml b/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml
deleted file mode 100644
index 882b522..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/OSGI-INF/ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry">
-   <service>
-      <provide interface="ru.arsysop.passage.lic.base.ui.LicensingImages"/>
-   </service>
-   <implementation class="ru.arsysop.passage.lic.internal.inspector.ui.LicesnsingImageRegistry"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/build.properties b/bundles/ru.arsysop.passage.lic.inspector.ui/build.properties
deleted file mode 100644
index 901b210..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               icons/
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/LicInspectorUi.java b/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/LicInspectorUi.java
deleted file mode 100644
index 5b455a4..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/LicInspectorUi.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.arsysop.passage.lic.inspector.ui;
-
-public class LicInspectorUi {
-	
-	public static final String IMG_INSPECTOR = "IMG_INSPECTOR"; //$NON-NLS-1$
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/hadlers/InspectHardwareHandler.java b/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/hadlers/InspectHardwareHandler.java
deleted file mode 100644
index 340fc62..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector.ui/src/ru/arsysop/passage/lic/inspector/ui/hadlers/InspectHardwareHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.inspector.ui.hadlers;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.swt.widgets.Shell;
-
-import ru.arsysop.passage.lic.base.ui.LicensingImages;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.inspector.ui.dialogs.HardwareInspectorDialog;
-
-public class InspectHardwareHandler {
-
-	@Execute
-	public void execute(LicensingImages images, HardwareInspector inspector, Shell shell) {
-		HardwareInspectorDialog dialog = new HardwareInspectorDialog(images, inspector, shell);
-		dialog.open();
-	}
-		
-}
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.inspector/.classpath b/bundles/ru.arsysop.passage.lic.inspector/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.inspector/.project b/bundles/ru.arsysop.passage.lic.inspector/.project
deleted file mode 100644
index e292dc5..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.inspector</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.inspector/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.inspector/META-INF/MANIFEST.MF
deleted file mode 100644
index af8298f..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.inspector
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.inspector
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: ru.arsysop.passage.lic.inspector
diff --git a/bundles/ru.arsysop.passage.lic.inspector/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.inspector/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index cb5ab01..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.inspector
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Inspector
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.inspector/build.properties b/bundles/ru.arsysop.passage.lic.inspector/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.inspector/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.json/.classpath b/bundles/ru.arsysop.passage.lic.json/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.json/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.json/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 69587ff..0000000
--- a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.json
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC JSON
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport.xml b/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport.xml
deleted file mode 100644
index a279b85..0000000
--- a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport">
-   <implementation class="ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport"/>
-   <property name="licensing.content.type" type="String" value="application/json"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.io.FeaturePermissionTransport"/>
-   </service>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport.xml b/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport.xml
deleted file mode 100644
index dd86cfd..0000000
--- a/bundles/ru.arsysop.passage.lic.json/OSGI-INF/ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport">
-   <property name="licensing.content.type" value="application/json"/>
-   <implementation class="ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport"/>
-   </service>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.json/build.properties b/bundles/ru.arsysop.passage.lic.json/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.json/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/ConditionDescriptorAggregator.java b/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/ConditionDescriptorAggregator.java
deleted file mode 100644
index dc489a1..0000000
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/ConditionDescriptorAggregator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-
-public class ConditionDescriptorAggregator {
-
-	private final List<BaseLicensingCondition> licensingConditions = new ArrayList<>();
-
-	public List<BaseLicensingCondition> getLicensingConditions() {
-		return licensingConditions;
-	}
-
-	public void addLicensingCondition(BaseLicensingCondition d) {
-		licensingConditions.add(d);
-	}
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionAggregator.java b/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionAggregator.java
deleted file mode 100644
index 53c8529..0000000
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionAggregator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import ru.arsysop.passage.lic.base.BaseFeaturePermission;
-
-public class FeaturePermissionAggregator {
-
-	private final List<BaseFeaturePermission> featurePermissions = new ArrayList<>();
-
-	public void addFeaturePermission(BaseFeaturePermission p) {
-		featurePermissions.add(p);
-	}
-
-	public List<BaseFeaturePermission> getFeaturePermissions() {
-		return featurePermissions;
-	}
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionMixln.java b/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionMixln.java
deleted file mode 100644
index ca3de53..0000000
--- a/bundles/ru.arsysop.passage.lic.json/src/ru/arsysop/passage/lic/internal/json/FeaturePermissionMixln.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.internal.json;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class FeaturePermissionMixln {
-
-	public FeaturePermissionMixln(@JsonProperty("featureIdentifier") String featureIdentifier,
-			@JsonProperty("matchVersion") String matchVersion, @JsonProperty("matchRule") String matchRule,
-			@JsonProperty("leaseTime") String leaseTime, @JsonProperty("expireTime") String expireTime) {
-	}
-}
diff --git a/bundles/ru.arsysop.passage.lic.model.core/.classpath b/bundles/ru.arsysop.passage.lic.model.core/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.model.core/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f6f4c39..0000000
--- a/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.model.core
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Model Core
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor.xml b/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor.xml
deleted file mode 100644
index 283bc8d..0000000
--- a/bundles/ru.arsysop.passage.lic.model.core/OSGI-INF/ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor">
-   <property name="licensing.content.type" value="application/xml"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport"/>
-   </service>
-   <implementation class="ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.model.core/build.properties b/bundles/ru.arsysop.passage.lic.model.core/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.model.core/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/LicModelCore.java b/bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/LicModelCore.java
deleted file mode 100644
index 2bd6992..0000000
--- a/bundles/ru.arsysop.passage.lic.model.core/src/ru/arsysop/passage/lic/model/core/LicModelCore.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.model.core;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public class LicModelCore {
-	
-	public static final String BUNDLE_SYMBOLIC_NAME = "ru.arsysop.passage.lic.model.core"; //$NON-NLS-1$
-
-	public static final String FILE_EXTENSION_FEATURES = "lic_features";  //$NON-NLS-1$
-	public static final String FILE_EXTENSION_PRODUCTS = "lic_products";  //$NON-NLS-1$
-	
-	public static final String FILE_EXTENSION_CONDITIONS = "lic_conditions";  //$NON-NLS-1$
-	public static final String FILE_EXTENSION_USERS = "lic_users";  //$NON-NLS-1$
-
-	public static IStatus save(Resource resource) {
-		try {
-			//FIXME: define parameters
-			resource.save(null);
-			return Status.OK_STATUS;
-		} catch (IOException e) {
-			return new Status(IStatus.ERROR, BUNDLE_SYMBOLIC_NAME, "Error saving resource", e);
-		}
-	}
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/.classpath b/bundles/ru.arsysop.passage.lic.model.ecore/.classpath
deleted file mode 100644
index 2aa7ad2..0000000
--- a/bundles/ru.arsysop.passage.lic.model.ecore/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/.project b/bundles/ru.arsysop.passage.lic.model.ecore/.project
deleted file mode 100644
index 414c24d..0000000
--- a/bundles/ru.arsysop.passage.lic.model.ecore/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.model.ecore</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f6f9c04..0000000
--- a/bundles/ru.arsysop.passage.lic.model.ecore/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.model.ecore
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Model Ecore
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.model.ecore/build.properties b/bundles/ru.arsysop.passage.lic.model.ecore/build.properties
deleted file mode 100644
index e94bce7..0000000
--- a/bundles/ru.arsysop.passage.lic.model.ecore/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = model/,\
-               META-INF/,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/.classpath b/bundles/ru.arsysop.passage.lic.model.edit/.classpath
deleted file mode 100644
index b618d57..0000000
--- a/bundles/ru.arsysop.passage.lic.model.edit/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/.project b/bundles/ru.arsysop.passage.lic.model.edit/.project
deleted file mode 100644
index a9b3c34..0000000
--- a/bundles/ru.arsysop.passage.lic.model.edit/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.model.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.model.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index e376db1..0000000
--- a/bundles/ru.arsysop.passage.lic.model.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: ru.arsysop.passage.lic.model.edit;singleton:=true
-Automatic-Module-Name: ru.arsysop.passage.lic.model.edit
-Bundle-Version: 0.3.2.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: ru.arsysop.passage.lic.model.edit.LicEditPlugin$Implementation$Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: ru.arsysop.passage.lic.model.edit,
- ru.arsysop.passage.lic.model.edit.providers
-Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
- ru.arsysop.passage.lic.model;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
-Import-Package: org.osgi.framework
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/build.properties b/bundles/ru.arsysop.passage.lic.model.edit/build.properties
deleted file mode 100644
index 9d3a213..0000000
--- a/bundles/ru.arsysop.passage.lic.model.edit/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# 	Copyright (c) 2018 ArSysOp
-# 
-# 	Licensed under the Apache License, Version 2.0 (the "License");
-# 	you may not use this file except in compliance with the License.
-# 	You may obtain a copy of the License at
-# 
-# 		http://www.apache.org/licenses/LICENSE-2.0
-# 
-# 	Unless required by applicable law or agreed to in writing, software
-# 	distributed under the License is distributed on an "AS IS" BASIS,
-# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 	See the License for the specific language governing permissions and
-# 	limitations under the License.
-# 
-# 	SPDX-License-Identifier: Apache-2.0
-# 
-# 	Contributors:
-# 		ArSysOp - initial API and implementation
-# 
-
-source.. = src-gen/
-output.. = target/classes/
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
diff --git a/bundles/ru.arsysop.passage.lic.model.edit/plugin.xml b/bundles/ru.arsysop.passage.lic.model.edit/plugin.xml
deleted file mode 100644
index b0aac1c..0000000
--- a/bundles/ru.arsysop.passage.lic.model.edit/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- 	Copyright (c) 2018 ArSysOp
- 
- 	Licensed under the Apache License, Version 2.0 (the "License");
- 	you may not use this file except in compliance with the License.
- 	You may obtain a copy of the License at
- 
- 		http://www.apache.org/licenses/LICENSE-2.0
- 
- 	Unless required by applicable law or agreed to in writing, software
- 	distributed under the License is distributed on an "AS IS" BASIS,
- 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 	See the License for the specific language governing permissions and
- 	limitations under the License.
- 
- 	SPDX-License-Identifier: Apache-2.0
- 
- 	Contributors:
- 		ArSysOp - initial API and implementation
- 
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated lic -->
-      <factory
-            uri="http://www.arsysop.ru/passage/lic/0.3.2"
-            class="ru.arsysop.passage.lic.model.edit.providers.LicItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-</plugin>
diff --git a/bundles/ru.arsysop.passage.lic.model/.classpath b/bundles/ru.arsysop.passage.lic.model/.classpath
deleted file mode 100644
index b618d57..0000000
--- a/bundles/ru.arsysop.passage.lic.model/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="target/classes/"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.model/.project b/bundles/ru.arsysop.passage.lic.model/.project
deleted file mode 100644
index 58afa57..0000000
--- a/bundles/ru.arsysop.passage.lic.model/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.model</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.model/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.model/META-INF/MANIFEST.MF
deleted file mode 100644
index 7070a58..0000000
--- a/bundles/ru.arsysop.passage.lic.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.model
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.model;singleton:=true
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Copyright: %pluginCopyright
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.ecore;visibility:=reexport,
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport,
- ru.arsysop.passage.lic.registry;bundle-version="0.0.0";visibility:=reexport
-Export-Package: ru.arsysop.passage.lic.model.api,
- ru.arsysop.passage.lic.model.impl,
- ru.arsysop.passage.lic.model.meta,
- ru.arsysop.passage.lic.model.util
-Bundle-ClassPath: .
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/ru.arsysop.passage.lic.model/build.properties b/bundles/ru.arsysop.passage.lic.model/build.properties
deleted file mode 100644
index 4c142f3..0000000
--- a/bundles/ru.arsysop.passage.lic.model/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src-gen/
-output.. = target/classes
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
diff --git a/bundles/ru.arsysop.passage.lic.model/model/lic.genmodel b/bundles/ru.arsysop.passage.lic.model/model/lic.genmodel
deleted file mode 100644
index 37657d7..0000000
--- a/bundles/ru.arsysop.passage.lic.model/model/lic.genmodel
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&#x9;Copyright (c) 2018 ArSysOp&#xA;&#xA;&#x9;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#xA;&#x9;you may not use this file except in compliance with the License.&#xA;&#x9;You may obtain a copy of the License at&#xA;&#xA;&#x9;&#x9;http://www.apache.org/licenses/LICENSE-2.0&#xA;&#xA;&#x9;Unless required by applicable law or agreed to in writing, software&#xA;&#x9;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#xA;&#x9;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#xA;&#x9;See the License for the specific language governing permissions and&#xA;&#x9;limitations under the License.&#xA;&#xA;&#x9;SPDX-License-Identifier: Apache-2.0&#xA;&#xA;&#x9;Contributors:&#xA;&#x9;&#x9;ArSysOp - initial API and implementation&#xA;"
-    modelDirectory="/ru.arsysop.passage.lic.model/src-gen" creationIcons="false" editDirectory="ru.arsysop.passage.lic.model.edit/src-gen"
-    editorDirectory="ru.arsysop.passage.lic.model.editor/src-gen" modelPluginID="ru.arsysop.passage.lic.model"
-    modelName="Lic" editPluginClass="ru.arsysop.passage.lic.model.edit.LicEditPlugin"
-    editorPluginClass="ru.arsysop.passage.lic.model.editor.LicEditorPlugin" nonNLSMarkers="true"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testSuiteClass="ru.arsysop.passage.lic.model.tests.LicAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
-    editPluginID="ru.arsysop.passage.lic.model.edit" editorPluginID="ru.arsysop.passage.lic.model.editor"
-    language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
-    oSGiCompatible="true">
-  <foreignModel>platform:/resource/ru.arsysop.passage.lic.model.ecore/model/lic.ecore</foreignModel>
-  <genPackages prefix="Lic" basePackage="ru.arsysop.passage" disposableProviderFactory="true"
-      interfacePackageSuffix="model.api" metaDataPackageSuffix="model.meta" classPackageSuffix="model.impl"
-      utilityPackageSuffix="model.util" providerPackageSuffix="model.edit.providers"
-      presentationPackageSuffix="model.editor" testsPackageSuffix="model.tests" ecorePackage="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#/">
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSetDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureVersionDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLineDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeatureDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOriginDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePackDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrantDescriptor"/>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureSet/features"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature/featureSet"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Feature/featureVersions"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/version"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/feature"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//FeatureVersion/news"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLine">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLine/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLine/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLine/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductLine/products"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product/productLine"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//Product/productVersions"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/version"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/installationToken"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/secureToken"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/news"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/product"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersion/productVersionFeatures"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/featureIdentifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/featureVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/restrictionLevel"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//ProductVersionFeature/productVersion"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOrigin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/description"/>
-      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//UserOrigin/users"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User/email"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User/fullName"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User/description"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//User/userOrigin"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/issueDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/productIdentifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/productVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/userIdentifier"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicensePack/licenseGrants"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/featureIdentifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/matchVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/matchRule"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/validFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/validUntil"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/conditionType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/conditionExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/capacity"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ../../ru.arsysop.passage.lic.model.ecore/model/lic.ecore#//LicenseGrant/licensePack"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/ru.arsysop.passage.lic.model/plugin.properties b/bundles/ru.arsysop.passage.lic.model/plugin.properties
deleted file mode 100644
index de0c0b9..0000000
--- a/bundles/ru.arsysop.passage.lic.model/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.runtime.model
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-pluginName = Passage LIC Model
-providerName = ArSysOp
-pluginCopyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.model/plugin.xml b/bundles/ru.arsysop.passage.lic.model/plugin.xml
deleted file mode 100644
index 2d45f0d..0000000
--- a/bundles/ru.arsysop.passage.lic.model/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated passage -->
-      <package
-            uri="http://www.arsysop.ru/passage/lic/0.3.2/"
-            class="ru.arsysop.passage.lic.model.meta.LicPackage"
-            genModel="model/lic.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/bundles/ru.arsysop.passage.lic.net/.classpath b/bundles/ru.arsysop.passage.lic.net/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.net/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.net/.project b/bundles/ru.arsysop.passage.lic.net/.project
deleted file mode 100644
index 6022f3f..0000000
--- a/bundles/ru.arsysop.passage.lic.net/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.net</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.net/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 9a996c4..0000000
--- a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.net
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Net
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator.xml b/bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator.xml
deleted file mode 100644
index 22adfc4..0000000
--- a/bundles/ru.arsysop.passage.lic.net/OSGI-INF/ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator">
-   <implementation class="ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConditionEvaluator"/>
-   </service>
-   <property name="licensing.condition.type" type="String" value="ntp"/>
-</scr:component>
diff --git a/bundles/ru.arsysop.passage.lic.net/build.properties b/bundles/ru.arsysop.passage.lic.net/build.properties
deleted file mode 100644
index 3571c40..0000000
--- a/bundles/ru.arsysop.passage.lic.net/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
diff --git a/bundles/ru.arsysop.passage.lic.oshi/.classpath b/bundles/ru.arsysop.passage.lic.oshi/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.oshi/.project b/bundles/ru.arsysop.passage.lic.oshi/.project
deleted file mode 100644
index 478466c..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.oshi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.oshi/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.oshi/META-INF/MANIFEST.MF
deleted file mode 100644
index 9b1bde1..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.oshi
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.oshi
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.sun.jna;bundle-version="4.5.1",
- com.sun.jna.platform;bundle-version="4.5.1",
- org.eclipse.osgi.services;bundle-version="0.0.0",
- ru.arsysop.passage.brc.oshi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.inspector;bundle-version="0.0.0";visibility:=reexport
-Export-Package: ru.arsysop.passage.lic.internal.oshi;x-internal:=true,
- ru.arsysop.passage.lic.oshi
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/*.xml
diff --git a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index c6000a4..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.oshi	
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC OSHI
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector.xml b/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector.xml
deleted file mode 100644
index 9c60321..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/OSGI-INF/ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector">
-   <implementation class="ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.inspector.HardwareInspector"/>
-   </service>
-</scr:component>
diff --git a/bundles/ru.arsysop.passage.lic.oshi/build.properties b/bundles/ru.arsysop.passage.lic.oshi/build.properties
deleted file mode 100644
index 755ea8c..0000000
--- a/bundles/ru.arsysop.passage.lic.oshi/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
\ No newline at end of file
diff --git a/bundles/ru.arsysop.passage.lic.registry/.classpath b/bundles/ru.arsysop.passage.lic.registry/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.registry/.project b/bundles/ru.arsysop.passage.lic.registry/.project
deleted file mode 100644
index 4832471..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.registry</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/ru.arsysop.passage.lic.registry/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.registry/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e253e2..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.registry
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.registry
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: ru.arsysop.passage.lic.runtime;bundle-version="0.0.0"
-Export-Package: ru.arsysop.passage.lic.registry
diff --git a/bundles/ru.arsysop.passage.lic.registry/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.registry/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 05aa8fa..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.registry
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Registry
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.registry/build.properties b/bundles/ru.arsysop.passage.lic.registry/build.properties
deleted file mode 100644
index 6e1747e..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               OSGI-INF/,\
-               .
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/DescriptorRegistry.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/DescriptorRegistry.java
deleted file mode 100644
index dec634a..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/DescriptorRegistry.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface DescriptorRegistry {
-	
-	void registerSource(String source);
-
-	void unregisterSource(String source);
-	
-	Iterable<String> getSources();
-	
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureDescriptor.java
deleted file mode 100644
index 105d755..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface FeatureDescriptor extends Identified {
-
-	String getName();
-
-	String getDescription();
-	
-	FeatureSetDescriptor getFeatureSet();
-	
-	Iterable<? extends FeatureVersionDescriptor> getFeatureVersions();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureSetDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureSetDescriptor.java
deleted file mode 100644
index 7d9adc7..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureSetDescriptor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface FeatureSetDescriptor extends Identified {
-
-	String getName();
-
-	String getDescription();
-	
-	Iterable<? extends FeatureDescriptor> getFeatures();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureVersionDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureVersionDescriptor.java
deleted file mode 100644
index e9d4973..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/FeatureVersionDescriptor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface FeatureVersionDescriptor {
-
-	public String getVersion();
-
-	public String getNews();
-
-	public FeatureDescriptor getFeature();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/Identified.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/Identified.java
deleted file mode 100644
index c65555f..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/Identified.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface Identified {
-	
-	String getIdentifier();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseGrantDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseGrantDescriptor.java
deleted file mode 100644
index 0c3971b..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseGrantDescriptor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-
-public interface LicenseGrantDescriptor extends LicensingCondition {
-
-	int getCapacity();
-	
-	LicensePackDescriptor getLicensePack();
-	
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicensePackDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicensePackDescriptor.java
deleted file mode 100644
index ee49742..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicensePackDescriptor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface LicensePackDescriptor extends Identified {
-	
-	Iterable<? extends LicenseGrantDescriptor> getLicenseGrants();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseRegistry.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseRegistry.java
deleted file mode 100644
index 58b9735..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/LicenseRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface LicenseRegistry extends DescriptorRegistry {
-	
-	Iterable<LicensePackDescriptor> getLicensePacks();
-
-	Iterable<LicensePackDescriptor> getUserLicensePacks(String userId);
-
-	Iterable<LicensePackDescriptor> getProductVersionLicensePacks(String productId, String version);
-
-	LicensePackDescriptor getLicensePack(String licensePackId);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductDescriptor.java
deleted file mode 100644
index 5020f28..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface ProductDescriptor extends Identified {
-	
-	String getName();
-	
-	String getDescription();
-
-	ProductLineDescriptor getProductLine();
-
-	Iterable<? extends ProductVersionDescriptor> getProductVersions();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductLineDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductLineDescriptor.java
deleted file mode 100644
index 60bf34d..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductLineDescriptor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface ProductLineDescriptor extends Identified {
-
-	String getName();
-
-	String getDescription();
-	
-	Iterable<? extends ProductDescriptor> getProducts();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionDescriptor.java
deleted file mode 100644
index decbcd0..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionDescriptor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface ProductVersionDescriptor {
-
-	String getVersion();
-
-	public String getNews();
-
-	String getInstallationToken();
-
-	String getSecureToken();
-	
-	ProductDescriptor getProduct();
-
-	Iterable<? extends ProductVersionFeatureDescriptor> getProductVersionFeatures();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionFeatureDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionFeatureDescriptor.java
deleted file mode 100644
index 21abb00..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/ProductVersionFeatureDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface ProductVersionFeatureDescriptor {
-
-	String getFeatureIdentifier();
-	
-	String getFeatureVersion();
-
-	String getRestrictionLevel();
-
-	ProductVersionDescriptor getProductVersion();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserDescriptor.java
deleted file mode 100644
index af6d030..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface UserDescriptor extends Identified {
-	
-	String getEmail();
-
-	String getFullName();
-
-	String getDescription();
-	
-	UserOriginDescriptor getUserOrigin();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserOriginDescriptor.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserOriginDescriptor.java
deleted file mode 100644
index f7ee1a8..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserOriginDescriptor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface UserOriginDescriptor extends Identified {
-	
-	String getName();
-
-	String getDescription();
-
-	Iterable<? extends UserDescriptor> getUsers();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserRegistry.java b/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserRegistry.java
deleted file mode 100644
index b820654..0000000
--- a/bundles/ru.arsysop.passage.lic.registry/src/ru/arsysop/passage/lic/registry/UserRegistry.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.registry;
-
-public interface UserRegistry extends DescriptorRegistry {
-
-	Iterable<UserOriginDescriptor> getUserOrigins();
-
-	UserOriginDescriptor getUserOrigin(String userOriginId);
-
-	Iterable<UserDescriptor> getUsers();
-
-	Iterable<UserDescriptor> getUsers(String userOriginId);
-
-	UserDescriptor getUser(String userId);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/.classpath b/bundles/ru.arsysop.passage.lic.runtime/.classpath
deleted file mode 100644
index b32e089..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/ru.arsysop.passage.lic.runtime/META-INF/MANIFEST.MF b/bundles/ru.arsysop.passage.lic.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 93751d6..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.runtime
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.runtime
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: ru.arsysop.passage.lic.runtime,
- ru.arsysop.passage.lic.runtime.io
diff --git a/bundles/ru.arsysop.passage.lic.runtime/OSGI-INF/l10n/bundle.properties b/bundles/ru.arsysop.passage.lic.runtime/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 4349429..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.runtime
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Runtime
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/bundles/ru.arsysop.passage.lic.runtime/build.properties b/bundles/ru.arsysop.passage.lic.runtime/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionEvaluator.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionEvaluator.java
deleted file mode 100644
index f89921f..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionEvaluator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * Evaluates the collection of {@link LicensingCondition} to obtain a
- * collection of {@link FeaturePermission}
- *
- */
-public interface ConditionEvaluator {
-
-	Iterable<FeaturePermission> evaluateConditions(Iterable<LicensingCondition> conditions, LicensingConfiguration configuration);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionMiner.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionMiner.java
deleted file mode 100644
index 3d24816..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConditionMiner.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * The miner to extract {@link LicensingCondition}(s) from different sources:
- * <li>local file system</li>
- * <li>network server</li>
- * <li>etc</li>
- */
-public interface ConditionMiner {
-
-	/**
-	 * 
-	 * @param configuration
-	 * @return
-	 */
-	Iterable<LicensingCondition> extractLicensingConditions(LicensingConfiguration configuration);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationResolver.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationResolver.java
deleted file mode 100644
index 0122f95..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/ConfigurationResolver.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * 
- * Resolves the given configuration and produces
- * {@link ConfigurationRequirement}(s).
- *
- */
-public interface ConfigurationResolver {
-
-	/**
-	 * 
-	 * @param configuration
-	 * @return
-	 */
-	Iterable<ConfigurationRequirement> resolveConfigurationRequirements(LicensingConfiguration configuration);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/FeaturePermission.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/FeaturePermission.java
deleted file mode 100644
index 2d2ef51..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/FeaturePermission.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-import java.util.Date;
-
-/**
- * Permission to use the component of given name and version range obtained from
- * {@link ConditionEvaluator} as a result of evaluation for
- * {@link LicensingCondition}
- */
-public interface FeaturePermission {
-
-	LicensingCondition getLicensingCondition();
-
-	LicensingConfiguration getLicensingConfiguration();
-
-	Date getLeaseDate();
-
-	Date getExpireDate();
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingConfiguration.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingConfiguration.java
deleted file mode 100644
index 7c38fe4..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/LicensingConfiguration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-public interface LicensingConfiguration {
-	
-	String getProductIdentifier();
-
-	String getProductVersion();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/PermissionExaminer.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/PermissionExaminer.java
deleted file mode 100644
index ddced57..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/PermissionExaminer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * Examines how {@link FeaturePermission}(s) cover the
- * {@link ConfigurationRequirement}(s) and produce {@link RestrictionVerdict}(s)
- * to be consumed by {@link RestrictionExecutor}(s)
- */
-public interface PermissionExaminer {
-
-	Iterable<RestrictionVerdict> examine(Iterable<ConfigurationRequirement> requirements,
-			Iterable<FeaturePermission> permissions);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionExecutor.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionExecutor.java
deleted file mode 100644
index 0a870dc..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionExecutor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * 
- * Realize the {@link RestrictionVerdict}(s) for the licensed feature: 
- * <li>early exit from command line tools with notice</li>
- * <li>blocking dialogs for UI application</li>
- * <li>filtering out the UI</li>
- * <li>blocking of bundles using OSGi level</li>
- *
- */
-public interface RestrictionExecutor {
-
-	void execute(Iterable<RestrictionVerdict> actions);
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionVerdict.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionVerdict.java
deleted file mode 100644
index 892f1b2..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/RestrictionVerdict.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime;
-
-/**
- * 
- * The data required to execute the permission, produced by
- * {@link PermissionExaminer} and consumed by {@link RestrictionExecutor}
- *
- */
-public interface RestrictionVerdict {
-
-	ConfigurationRequirement getConfigurationRequirement();
-
-	String getRestrictionLevel();
-
-}
diff --git a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/KeyKeeper.java b/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/KeyKeeper.java
deleted file mode 100644
index 07113da..0000000
--- a/bundles/ru.arsysop.passage.lic.runtime/src/ru/arsysop/passage/lic/runtime/io/KeyKeeper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.runtime.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
-/**
- * Provides the key required for given configuration
- *
- */
-public interface KeyKeeper {
-	
-	/**
-	 * 
-	 * @param configuration
-	 * @return the stream to read the key
-	 * @throws IOException
-	 */
-	
-	InputStream openKeyStream(LicensingConfiguration configuration) throws IOException;
-
-}
diff --git a/features/org.eclipse.passage.lic.bc.feature/.project b/features/org.eclipse.passage.lic.bc.feature/.project
new file mode 100644
index 0000000..af9d7f2
--- /dev/null
+++ b/features/org.eclipse.passage.lic.bc.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.bc.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.equinox.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.bc.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.equinox.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.bc.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.bc.feature/build.properties b/features/org.eclipse.passage.lic.bc.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.bc.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.bc.feature/feature.properties b/features/org.eclipse.passage.lic.bc.feature/feature.properties
new file mode 100644
index 0000000..d77609b
--- /dev/null
+++ b/features/org.eclipse.passage.lic.bc.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.bc.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC BC
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: Bouncy Castle integration
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.bc.feature/feature.xml b/features/org.eclipse.passage.lic.bc.feature/feature.xml
new file mode 100644
index 0000000..7a7a64f
--- /dev/null
+++ b/features/org.eclipse.passage.lic.bc.feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.bc.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.bc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.equinox.feature/.project b/features/org.eclipse.passage.lic.equinox.feature/.project
new file mode 100644
index 0000000..a97d2ef
--- /dev/null
+++ b/features/org.eclipse.passage.lic.equinox.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.equinox.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.equinox.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.equinox.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.equinox.feature/build.properties b/features/org.eclipse.passage.lic.equinox.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.equinox.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.equinox.feature/feature.properties b/features/org.eclipse.passage.lic.equinox.feature/feature.properties
new file mode 100644
index 0000000..196ee90
--- /dev/null
+++ b/features/org.eclipse.passage.lic.equinox.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.equinox.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC Equinox
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components Equinox includes runtime interfaces and its implementation for Eclipse Equinox
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.equinox.feature/feature.xml b/features/org.eclipse.passage.lic.equinox.feature/feature.xml
new file mode 100644
index 0000000..4194758
--- /dev/null
+++ b/features/org.eclipse.passage.lic.equinox.feature/feature.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.equinox.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.passage.lic.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.inspector"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.equinox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.jface"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.feature/.project b/features/org.eclipse.passage.lic.feature/.project
new file mode 100644
index 0000000..2218c1d
--- /dev/null
+++ b/features/org.eclipse.passage.lic.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.inspector.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.inspector.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.feature/build.properties b/features/org.eclipse.passage.lic.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.feature/feature.properties b/features/org.eclipse.passage.lic.feature/feature.properties
new file mode 100644
index 0000000..4e8b6bb
--- /dev/null
+++ b/features/org.eclipse.passage.lic.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage Licensing Integration Components
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components layer includes interfaces and its implementation for Eclipse Equinox
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.feature/feature.xml b/features/org.eclipse.passage.lic.feature/feature.xml
new file mode 100644
index 0000000..a93c238
--- /dev/null
+++ b/features/org.eclipse.passage.lic.feature/feature.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.passage.lic.equinox.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.passage.lic.net.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.passage.lic.oshi.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.passage.lic.model.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.passage.lic.inspector.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.inspector.feature/.project b/features/org.eclipse.passage.lic.inspector.feature/.project
new file mode 100644
index 0000000..2313f56
--- /dev/null
+++ b/features/org.eclipse.passage.lic.inspector.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.inspector.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.json.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.inspector.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.json.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.inspector.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.inspector.feature/build.properties b/features/org.eclipse.passage.lic.inspector.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.inspector.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.inspector.feature/feature.properties b/features/org.eclipse.passage.lic.inspector.feature/feature.properties
new file mode 100644
index 0000000..33fac23
--- /dev/null
+++ b/features/org.eclipse.passage.lic.inspector.feature/feature.properties
@@ -0,0 +1,26 @@
+#Properties file for org.eclipse.passage.lic.inspector.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC Inspector
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: Configuration and Requirements Inspector
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
+
diff --git a/features/org.eclipse.passage.lic.inspector.feature/feature.xml b/features/org.eclipse.passage.lic.inspector.feature/feature.xml
new file mode 100644
index 0000000..063dc25
--- /dev/null
+++ b/features/org.eclipse.passage.lic.inspector.feature/feature.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.inspector.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0"/>
+      <import feature="org.eclipse.passage.lic.model.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.emf.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.model.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.inspector.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.json.feature/.project b/features/org.eclipse.passage.lic.json.feature/.project
new file mode 100644
index 0000000..ec64991
--- /dev/null
+++ b/features/org.eclipse.passage.lic.json.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.json.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.model.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.json.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.model.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.json.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.json.feature/build.properties b/features/org.eclipse.passage.lic.json.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.json.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.json.feature/feature.properties b/features/org.eclipse.passage.lic.json.feature/feature.properties
new file mode 100644
index 0000000..468fc6d
--- /dev/null
+++ b/features/org.eclipse.passage.lic.json.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.json.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC JSON
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: JSON support
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.json.feature/feature.xml b/features/org.eclipse.passage.lic.json.feature/feature.xml
new file mode 100644
index 0000000..28c867f
--- /dev/null
+++ b/features/org.eclipse.passage.lic.json.feature/feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.json.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0"/>
+      <import feature="org.eclipse.passage.lic.net.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.model.feature/.project b/features/org.eclipse.passage.lic.model.feature/.project
new file mode 100644
index 0000000..0cb2294
--- /dev/null
+++ b/features/org.eclipse.passage.lic.model.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.model.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.net.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.model.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.net.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.model.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.model.feature/build.properties b/features/org.eclipse.passage.lic.model.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.model.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.model.feature/feature.properties b/features/org.eclipse.passage.lic.model.feature/feature.properties
new file mode 100644
index 0000000..d178a13
--- /dev/null
+++ b/features/org.eclipse.passage.lic.model.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.model.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC Model
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: EMF Model API for Licensing data
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.model.feature/feature.xml b/features/org.eclipse.passage.lic.model.feature/feature.xml
new file mode 100644
index 0000000..960f36d
--- /dev/null
+++ b/features/org.eclipse.passage.lic.model.feature/feature.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.model.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0" match="equivalent"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.model.ecore"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.passage.lic.model.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.net.feature/.project b/features/org.eclipse.passage.lic.net.feature/.project
new file mode 100644
index 0000000..54b3831
--- /dev/null
+++ b/features/org.eclipse.passage.lic.net.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.net.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.oshi.feature/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.net.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from features/ru.arsysop.passage.lic.oshi.feature/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.net.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.net.feature/build.properties b/features/org.eclipse.passage.lic.net.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.net.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.net.feature/feature.properties b/features/org.eclipse.passage.lic.net.feature/feature.properties
new file mode 100644
index 0000000..f7eca6c
--- /dev/null
+++ b/features/org.eclipse.passage.lic.net.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.net.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC Net
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: Network facilities integration
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.net.feature/feature.xml b/features/org.eclipse.passage.lic.net.feature/feature.xml
new file mode 100644
index 0000000..2b00d02
--- /dev/null
+++ b/features/org.eclipse.passage.lic.net.feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.net.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.net"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.passage.lic.oshi.feature/.project b/features/org.eclipse.passage.lic.oshi.feature/.project
new file mode 100644
index 0000000..f044f92
--- /dev/null
+++ b/features/org.eclipse.passage.lic.oshi.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.oshi.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.base.tests/.settings/org.sonarlint.eclipse.core.prefs b/features/org.eclipse.passage.lic.oshi.feature/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.base.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to features/org.eclipse.passage.lic.oshi.feature/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/features/org.eclipse.passage.lic.oshi.feature/build.properties b/features/org.eclipse.passage.lic.oshi.feature/build.properties
new file mode 100644
index 0000000..6dc34af
--- /dev/null
+++ b/features/org.eclipse.passage.lic.oshi.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.passage.lic.oshi.feature/feature.properties b/features/org.eclipse.passage.lic.oshi.feature/feature.properties
new file mode 100644
index 0000000..f13baa6
--- /dev/null
+++ b/features/org.eclipse.passage.lic.oshi.feature/feature.properties
@@ -0,0 +1,25 @@
+#Properties file for org.eclipse.passage.lic.oshi.feature
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+featureName=Passage LIC OSHI
+providerName=Eclipse Passage
+description=Passage Licensing Integration Components: OSHI integration
+copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+
diff --git a/features/org.eclipse.passage.lic.oshi.feature/feature.xml b/features/org.eclipse.passage.lic.oshi.feature/feature.xml
new file mode 100644
index 0000000..2c322c0
--- /dev/null
+++ b/features/org.eclipse.passage.lic.oshi.feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<feature
+      id="org.eclipse.passage.lic.oshi.feature"
+      label="%featureName"
+      version="0.3.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.passage.lic.equinox.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.passage.lic.oshi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/pom.xml b/features/pom.xml
index 91c44c9..e55430a 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
@@ -26,14 +18,14 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>ru.arsysop.passage.lic.features</artifactId>
+	<artifactId>org.eclipse.passage.lic.features</artifactId>
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../releng/ru.arsysop.passage.lic.parent</relativePath>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../releng/org.eclipse.passage.lic.parent</relativePath>
 	</parent>
 
 </project>
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.bc.feature/.project b/features/ru.arsysop.passage.lic.bc.feature/.project
deleted file mode 100644
index 16c696a..0000000
--- a/features/ru.arsysop.passage.lic.bc.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.bc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.bc.feature/build.properties b/features/ru.arsysop.passage.lic.bc.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.bc.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.bc.feature/feature.properties b/features/ru.arsysop.passage.lic.bc.feature/feature.properties
deleted file mode 100644
index 53a6939..0000000
--- a/features/ru.arsysop.passage.lic.bc.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.bc.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC BC
-providerName=ArSysOp
-description=Passage Licensing Integration Components: Bouncy Castle integration
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.bc.feature/feature.xml b/features/ru.arsysop.passage.lic.bc.feature/feature.xml
deleted file mode 100644
index 70757ca..0000000
--- a/features/ru.arsysop.passage.lic.bc.feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.bc.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.bc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.equinox.feature/.project b/features/ru.arsysop.passage.lic.equinox.feature/.project
deleted file mode 100644
index b1a13c7..0000000
--- a/features/ru.arsysop.passage.lic.equinox.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.equinox.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.equinox.feature/build.properties b/features/ru.arsysop.passage.lic.equinox.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.equinox.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.equinox.feature/feature.properties b/features/ru.arsysop.passage.lic.equinox.feature/feature.properties
deleted file mode 100644
index 8e8d394..0000000
--- a/features/ru.arsysop.passage.lic.equinox.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.equinox.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC Equinox
-providerName=ArSysOp
-description=Passage Licensing Integration Components Equinox includes runtime interfaces and its implementation for Eclipse Equinox
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.equinox.feature/feature.xml b/features/ru.arsysop.passage.lic.equinox.feature/feature.xml
deleted file mode 100644
index 00ee78c..0000000
--- a/features/ru.arsysop.passage.lic.equinox.feature/feature.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.equinox.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="ru.arsysop.passage.lic.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.inspector"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.equinox"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.feature/.project b/features/ru.arsysop.passage.lic.feature/.project
deleted file mode 100644
index 68af51d..0000000
--- a/features/ru.arsysop.passage.lic.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.feature/build.properties b/features/ru.arsysop.passage.lic.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.feature/feature.properties b/features/ru.arsysop.passage.lic.feature/feature.properties
deleted file mode 100644
index bda32f8..0000000
--- a/features/ru.arsysop.passage.lic.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage Licensing Integration Components
-providerName=ArSysOp
-description=Passage Licensing Integration Components layer includes interfaces and its implementation for Eclipse Equinox
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.feature/feature.xml b/features/ru.arsysop.passage.lic.feature/feature.xml
deleted file mode 100644
index b4129ce..0000000
--- a/features/ru.arsysop.passage.lic.feature/feature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="ru.arsysop.passage.lic.equinox.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="ru.arsysop.passage.lic.net.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="ru.arsysop.passage.lic.oshi.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="ru.arsysop.passage.lic.model.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="ru.arsysop.passage.lic.inspector.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.inspector.feature/.project b/features/ru.arsysop.passage.lic.inspector.feature/.project
deleted file mode 100644
index 5cbe751..0000000
--- a/features/ru.arsysop.passage.lic.inspector.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.inspector.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.inspector.feature/build.properties b/features/ru.arsysop.passage.lic.inspector.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.inspector.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.inspector.feature/feature.properties b/features/ru.arsysop.passage.lic.inspector.feature/feature.properties
deleted file mode 100644
index 28af2a7..0000000
--- a/features/ru.arsysop.passage.lic.inspector.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.inspector.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC Inspector
-providerName=ArSysOp
-description=Passage Licensing Integration Components: Configuration and Requirements Inspector
-copyright=Copyright (c) 2018 ArSysOp
diff --git a/features/ru.arsysop.passage.lic.inspector.feature/feature.xml b/features/ru.arsysop.passage.lic.inspector.feature/feature.xml
deleted file mode 100644
index c49e7ba..0000000
--- a/features/ru.arsysop.passage.lic.inspector.feature/feature.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.inspector.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0"/>
-      <import feature="ru.arsysop.passage.lic.model.feature" version="0.0.0"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.base.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.model.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.inspector.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.json.feature/.project b/features/ru.arsysop.passage.lic.json.feature/.project
deleted file mode 100644
index dbf784d..0000000
--- a/features/ru.arsysop.passage.lic.json.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.json.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.json.feature/build.properties b/features/ru.arsysop.passage.lic.json.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.json.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.json.feature/feature.properties b/features/ru.arsysop.passage.lic.json.feature/feature.properties
deleted file mode 100644
index 45ef161..0000000
--- a/features/ru.arsysop.passage.lic.json.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.json.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC JSON
-providerName=ArSysOp
-description=Passage Licensing Integration Components: JSON support
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.json.feature/feature.xml b/features/ru.arsysop.passage.lic.json.feature/feature.xml
deleted file mode 100644
index 9dcd2b6..0000000
--- a/features/ru.arsysop.passage.lic.json.feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.json.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0"/>
-      <import feature="ru.arsysop.passage.lic.net.feature" version="0.0.0"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.json"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.model.feature/.project b/features/ru.arsysop.passage.lic.model.feature/.project
deleted file mode 100644
index 3a3d894..0000000
--- a/features/ru.arsysop.passage.lic.model.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.model.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.model.feature/build.properties b/features/ru.arsysop.passage.lic.model.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.model.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.model.feature/feature.properties b/features/ru.arsysop.passage.lic.model.feature/feature.properties
deleted file mode 100644
index d071438..0000000
--- a/features/ru.arsysop.passage.lic.model.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.model.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC Model
-providerName=ArSysOp
-description=Passage Licensing Integration Components: EMF Model API for Licensing data
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.model.feature/feature.xml b/features/ru.arsysop.passage.lic.model.feature/feature.xml
deleted file mode 100644
index 42ee2b3..0000000
--- a/features/ru.arsysop.passage.lic.model.feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.model.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.model.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ru.arsysop.passage.lic.model.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.net.feature/.project b/features/ru.arsysop.passage.lic.net.feature/.project
deleted file mode 100644
index ee4001e..0000000
--- a/features/ru.arsysop.passage.lic.net.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.net.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.net.feature/build.properties b/features/ru.arsysop.passage.lic.net.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.net.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.net.feature/feature.properties b/features/ru.arsysop.passage.lic.net.feature/feature.properties
deleted file mode 100644
index aa356e1..0000000
--- a/features/ru.arsysop.passage.lic.net.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.net.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC Net
-providerName=ArSysOp
-description=Passage Licensing Integration Components: Network facilities integration
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.net.feature/feature.xml b/features/ru.arsysop.passage.lic.net.feature/feature.xml
deleted file mode 100644
index 5e6288e..0000000
--- a/features/ru.arsysop.passage.lic.net.feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.net.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/ru.arsysop.passage.lic.oshi.feature/.project b/features/ru.arsysop.passage.lic.oshi.feature/.project
deleted file mode 100644
index 6e4eb90..0000000
--- a/features/ru.arsysop.passage.lic.oshi.feature/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.oshi.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/ru.arsysop.passage.lic.oshi.feature/build.properties b/features/ru.arsysop.passage.lic.oshi.feature/build.properties
deleted file mode 100644
index 2c656df..0000000
--- a/features/ru.arsysop.passage.lic.oshi.feature/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/ru.arsysop.passage.lic.oshi.feature/feature.properties b/features/ru.arsysop.passage.lic.oshi.feature/feature.properties
deleted file mode 100644
index 9048fd3..0000000
--- a/features/ru.arsysop.passage.lic.oshi.feature/feature.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.oshi.feature
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-featureName=Passage LIC OSHI
-providerName=ArSysOp
-description=Passage Licensing Integration Components: OSHI integration
-copyright=Copyright (c) 2018 ArSysOp
\ No newline at end of file
diff --git a/features/ru.arsysop.passage.lic.oshi.feature/feature.xml b/features/ru.arsysop.passage.lic.oshi.feature/feature.xml
deleted file mode 100644
index d2d7c61..0000000
--- a/features/ru.arsysop.passage.lic.oshi.feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<feature
-      id="ru.arsysop.passage.lic.oshi.feature"
-      label="%featureName"
-      version="0.3.2.qualifier"
-      provider-name="%providerName"
-      license-feature="ru.arsysop.passage.brc.license.feature"
-      license-feature-version="0.3.2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="ru.arsysop.passage.lic.equinox.feature" version="0.0.0"/>
-   </requires>
-
-   <plugin
-         id="ru.arsysop.passage.lic.oshi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/pom.xml b/pom.xml
index 096362a..22002ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
@@ -26,18 +18,18 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>ru.arsysop.passage.lic.root</artifactId>
+	<artifactId>org.eclipse.passage.lic.root</artifactId>
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>./releng/ru.arsysop.passage.lic.parent</relativePath>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>./releng/org.eclipse.passage.lic.parent</relativePath>
 	</parent>
 
 	<modules>
-		<module>./releng/ru.arsysop.passage.lic.aggregator</module>
+		<module>./releng/org.eclipse.passage.lic.aggregator</module>
 	</modules>
 
 </project>
diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml
new file mode 100644
index 0000000..2a336fb
--- /dev/null
+++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.aggregator</artifactId>
+	<packaging>pom</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../../releng/org.eclipse.passage.lic.parent</relativePath>
+	</parent>
+
+	<modules>
+		<module>../../releng/org.eclipse.passage.lic.target</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.runtime</module>
+		<module>../../bundles/org.eclipse.passage.lic.base</module>
+		<module>../../bundles/org.eclipse.passage.lic.inspector</module>
+		<module>../../bundles/org.eclipse.passage.lic.equinox</module>
+		<module>../../bundles/org.eclipse.passage.lic.jface</module>
+		<module>../../features/org.eclipse.passage.lic.equinox.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.bc</module>
+		<module>../../features/org.eclipse.passage.lic.bc.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.net</module>
+		<module>../../features/org.eclipse.passage.lic.net.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.json</module>
+		<module>../../features/org.eclipse.passage.lic.json.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.oshi</module>
+		<module>../../features/org.eclipse.passage.lic.oshi.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.registry</module>
+		<module>../../bundles/org.eclipse.passage.lic.model.ecore</module>
+		<module>../../bundles/org.eclipse.passage.lic.model</module>
+		<module>../../bundles/org.eclipse.passage.lic.model.core</module>
+		<module>../../features/org.eclipse.passage.lic.model.feature</module>
+
+		<module>../../bundles/org.eclipse.passage.lic.emf.edit</module>
+		<module>../../bundles/org.eclipse.passage.lic.model.edit</module>
+		<module>../../bundles/org.eclipse.passage.lic.inspector.ui</module>
+		<module>../../features/org.eclipse.passage.lic.inspector.feature</module>
+
+		<module>../../features/org.eclipse.passage.lic.feature</module>
+		<module>../../releng/org.eclipse.passage.lic.repository</module>
+
+		<module>../../tests/org.eclipse.passage.lic.base.tests</module>
+		<module>../../tests/org.eclipse.passage.lic.bc.tests</module>
+		<module>../../tests/org.eclipse.passage.lic.equinox.tests</module>
+		<module>../../tests/org.eclipse.passage.lic.net.tests</module>
+		<module>../../tests/org.eclipse.passage.lic.oshi.tests</module>
+		<module>../../tests/org.eclipse.passage.lic.model.core.tests</module>
+
+		<module>../../tests/org.eclipse.passage.lic.integration.tests</module>
+
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/releng/ru.arsysop.passage.lic.parent/pom.xml b/releng/org.eclipse.passage.lic.parent/pom.xml
similarity index 65%
rename from releng/ru.arsysop.passage.lic.parent/pom.xml
rename to releng/org.eclipse.passage.lic.parent/pom.xml
index fcd948d..d1fc64b 100644
--- a/releng/ru.arsysop.passage.lic.parent/pom.xml
+++ b/releng/org.eclipse.passage.lic.parent/pom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
@@ -26,9 +18,9 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>ru.arsysop.passage.lic</groupId>
-	<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-	<version>0.3.2</version>
+	<groupId>org.eclipse.passage.lic</groupId>
+	<artifactId>org.eclipse.passage.lic.parent</artifactId>
+	<version>0.3.3</version>
 	<packaging>pom</packaging>
 
 	<prerequisites>
@@ -59,8 +51,8 @@
 				<configuration>
 					<target>
 						<artifact>
-							<groupId>ru.arsysop.passage.lic</groupId>
-							<artifactId>ru.arsysop.passage.lic.target</artifactId>
+							<groupId>org.eclipse.passage.lic</groupId>
+							<artifactId>org.eclipse.passage.lic.target</artifactId>
 							<version>${project.parent.version}</version>
 						</artifact>
 					</target>
diff --git a/releng/org.eclipse.passage.lic.repository/category.xml b/releng/org.eclipse.passage.lic.repository/category.xml
new file mode 100644
index 0000000..0a3f818
--- /dev/null
+++ b/releng/org.eclipse.passage.lic.repository/category.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<site>
+	<feature
+		url="features/org.eclipse.passage.lic.equinox.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.equinox.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.net.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.net.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.oshi.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.oshi.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.model.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.model.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.inspector.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.inspector.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.bc.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.bc.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<feature
+		url="features/org.eclipse.passage.lic.json.feature_0.3.3.qualifier.jar"
+		id="org.eclipse.passage.lic.json.feature"
+		version="0.3.3.qualifier">
+		<category name="org.eclipse.passage.lic.category" />
+	</feature>
+	<category-def
+		name="org.eclipse.passage.lic.category"
+		label="Passage Licensing Integration Components"
+	>
+		<description>
+			Passage Licensing Integration Components layer includes runtime interfaces and its implementation for Eclipse Equinox
+		</description>
+	</category-def>
+</site>
diff --git a/releng/org.eclipse.passage.lic.repository/pom.xml b/releng/org.eclipse.passage.lic.repository/pom.xml
new file mode 100644
index 0000000..66e2cb2
--- /dev/null
+++ b/releng/org.eclipse.passage.lic.repository/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../../releng/org.eclipse.passage.lic.parent</relativePath>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/releng/ru.arsysop.passage.lic.target/ru.arsysop.passage.lic.target.target b/releng/org.eclipse.passage.lic.target/org.eclipse.passage.lic.target.target
similarity index 78%
rename from releng/ru.arsysop.passage.lic.target/ru.arsysop.passage.lic.target.target
rename to releng/org.eclipse.passage.lic.target/org.eclipse.passage.lic.target.target
index 4a238ec..5d8de4f 100644
--- a/releng/ru.arsysop.passage.lic.target/ru.arsysop.passage.lic.target.target
+++ b/releng/org.eclipse.passage.lic.target/org.eclipse.passage.lic.target.target
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
 -->
 <?pde version="3.8"?>
-<target name="ru.arsysop.passage.lic.target" sequenceNumber="15">
+<target name="org.eclipse.passage.lic.target" sequenceNumber="15">
 	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+			<repository location="http://download.eclipse.org/cbi/updates/license/"/>
+		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 			<repository location="http://download.eclipse.org/releases/2018-09/"/>
@@ -54,9 +50,8 @@
 			<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="ru.arsysop.passage.brc.license.feature.feature.group" version="0.0.0"/>
-			<unit id="ru.arsysop.passage.brc.oshi.feature.feature.group" version="0.0.0"/>
-			<repository location="http://dl.bintray.com/arsysop/passage-brc/0.3.2/"/>
+			<unit id="org.eclipse.passage.brc.oshi.feature.feature.group" version="0.0.0"/>
+			<repository location="http://dl.bintray.com/arsysop/passage-brc/0.3.3/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
diff --git a/releng/org.eclipse.passage.lic.target/pom.xml b/releng/org.eclipse.passage.lic.target/pom.xml
new file mode 100644
index 0000000..fee9e3a
--- /dev/null
+++ b/releng/org.eclipse.passage.lic.target/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2018-2019 ArSysOp and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.target</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../../releng/org.eclipse.passage.lic.parent</relativePath>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/releng/ru.arsysop.passage.lic.aggregator/pom.xml b/releng/ru.arsysop.passage.lic.aggregator/pom.xml
deleted file mode 100644
index 63f5e5c..0000000
--- a/releng/ru.arsysop.passage.lic.aggregator/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>ru.arsysop.passage.lic.aggregator</artifactId>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../../releng/ru.arsysop.passage.lic.parent</relativePath>
-	</parent>
-
-	<modules>
-		<module>../../releng/ru.arsysop.passage.lic.target</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.runtime</module>
-		<module>../../bundles/ru.arsysop.passage.lic.base</module>
-		<module>../../bundles/ru.arsysop.passage.lic.inspector</module>
-		<module>../../bundles/ru.arsysop.passage.lic.equinox</module>
-		<module>../../features/ru.arsysop.passage.lic.equinox.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.bc</module>
-		<module>../../features/ru.arsysop.passage.lic.bc.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.net</module>
-		<module>../../features/ru.arsysop.passage.lic.net.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.json</module>
-		<module>../../features/ru.arsysop.passage.lic.json.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.oshi</module>
-		<module>../../features/ru.arsysop.passage.lic.oshi.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.registry</module>
-		<module>../../bundles/ru.arsysop.passage.lic.model.ecore</module>
-		<module>../../bundles/ru.arsysop.passage.lic.model</module>
-		<module>../../bundles/ru.arsysop.passage.lic.model.core</module>
-		<module>../../features/ru.arsysop.passage.lic.model.feature</module>
-
-		<module>../../bundles/ru.arsysop.passage.lic.base.ui</module>
-		<module>../../bundles/ru.arsysop.passage.lic.model.edit</module>
-		<module>../../bundles/ru.arsysop.passage.lic.inspector.ui</module>
-		<module>../../features/ru.arsysop.passage.lic.inspector.feature</module>
-
-		<module>../../features/ru.arsysop.passage.lic.feature</module>
-		<module>../../releng/ru.arsysop.passage.lic.repository</module>
-
-		<module>../../tests/ru.arsysop.passage.lic.base.tests</module>
-		<module>../../tests/ru.arsysop.passage.lic.bc.tests</module>
-		<module>../../tests/ru.arsysop.passage.lic.equinox.tests</module>
-		<module>../../tests/ru.arsysop.passage.lic.net.tests</module>
-		<module>../../tests/ru.arsysop.passage.lic.oshi.tests</module>
-		<module>../../tests/ru.arsysop.passage.lic.model.core.tests</module>
-
-		<module>../../tests/ru.arsysop.passage.lic.integration.tests</module>
-
-	</modules>
-
-</project>
\ No newline at end of file
diff --git a/releng/ru.arsysop.passage.lic.repository/category.xml b/releng/ru.arsysop.passage.lic.repository/category.xml
deleted file mode 100644
index d6d6cbb..0000000
--- a/releng/ru.arsysop.passage.lic.repository/category.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<site>
-	<feature
-		url="features/ru.arsysop.passage.lic.equinox.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.equinox.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.net.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.net.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.oshi.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.oshi.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.model.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.model.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.inspector.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.inspector.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.bc.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.bc.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<feature
-		url="features/ru.arsysop.passage.lic.json.feature_0.3.2.qualifier.jar"
-		id="ru.arsysop.passage.lic.json.feature"
-		version="0.3.2.qualifier">
-		<category name="ru.arsysop.passage.lic.category" />
-	</feature>
-	<category-def
-		name="ru.arsysop.passage.lic.category"
-		label="Passage Licensing Integration Components"
-	>
-		<description>
-			Passage Licensing Integration Components layer includes runtime interfaces and its implementation for Eclipse Equinox
-		</description>
-	</category-def>
-</site>
diff --git a/releng/ru.arsysop.passage.lic.repository/pom.xml b/releng/ru.arsysop.passage.lic.repository/pom.xml
deleted file mode 100644
index b49e672..0000000
--- a/releng/ru.arsysop.passage.lic.repository/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>ru.arsysop.passage.lic.repository</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../../releng/ru.arsysop.passage.lic.parent</relativePath>
-	</parent>
-
-</project>
\ No newline at end of file
diff --git a/releng/ru.arsysop.passage.lic.target/pom.xml b/releng/ru.arsysop.passage.lic.target/pom.xml
deleted file mode 100644
index 2046ed9..0000000
--- a/releng/ru.arsysop.passage.lic.target/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>ru.arsysop.passage.lic.target</artifactId>
-	<packaging>eclipse-target-definition</packaging>
-
-	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../../releng/ru.arsysop.passage.lic.parent</relativePath>
-	</parent>
-
-</project>
\ No newline at end of file
diff --git a/tests/ru.arsysop.passage.lic.json.tests/.classpath b/tests/org.eclipse.passage.lic.base.tests/.classpath
similarity index 100%
rename from tests/ru.arsysop.passage.lic.json.tests/.classpath
rename to tests/org.eclipse.passage.lic.base.tests/.classpath
diff --git a/tests/org.eclipse.passage.lic.base.tests/.project b/tests/org.eclipse.passage.lic.base.tests/.project
new file mode 100644
index 0000000..eed763d
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.base.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.base.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.base.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.bc.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.base.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/ru.arsysop.passage.lic.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.base.tests/META-INF/MANIFEST.MF
similarity index 54%
rename from tests/ru.arsysop.passage.lic.base.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.base.tests/META-INF/MANIFEST.MF
index a80b187..298cd1a 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.base.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.base.tests
+Automatic-Module-Name: org.eclipse.passage.lic.base.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.base.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.base.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0"
+ org.eclipse.passage.lic.base;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..546124d
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.base.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Base Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.base.tests/build.properties b/tests/org.eclipse.passage.lic.base.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.base.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseAccessManagerTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseAccessManagerTest.java
similarity index 82%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseAccessManagerTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseAccessManagerTest.java
index ea2b1c0..469f0f6 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseAccessManagerTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseAccessManagerTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,17 +20,16 @@
 import java.util.Date;
 import java.util.List;
 
+import org.eclipse.passage.lic.base.BaseAccessManager;
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 import org.junit.After;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.BaseAccessManager;
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
-
 public class BaseAccessManagerTest {
 
 	private static final String PRODUCT_ID = "product.id"; //$NON-NLS-1$
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseConditionEvaluatorTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseConditionEvaluatorTest.java
similarity index 58%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseConditionEvaluatorTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseConditionEvaluatorTest.java
index a457bed..15b6355 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BaseConditionEvaluatorTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BaseConditionEvaluatorTest.java
@@ -1,35 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.passage.lic.base.BaseConditionEvaluator;
 import org.junit.After;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.BaseConditionEvaluator;
-
 public class BaseConditionEvaluatorTest {
 	
 	private Map<String, Object> segments = new HashMap<>();
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BasePermissionExaminerTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BasePermissionExaminerTest.java
similarity index 65%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BasePermissionExaminerTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BasePermissionExaminerTest.java
index 5a5b97a..2f9767e 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/BasePermissionExaminerTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/BasePermissionExaminerTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,23 +20,22 @@
 import java.util.Date;
 import java.util.Iterator;
 
+import org.eclipse.passage.lic.base.BaseConfigurationRequirement;
+import org.eclipse.passage.lic.base.BaseFeaturePermission;
+import org.eclipse.passage.lic.base.BasePermissionExaminer;
+import org.eclipse.passage.lic.base.ConfigurationRequirements;
+import org.eclipse.passage.lic.base.FeaturePermissions;
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.base.LicensingVersions;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.BaseConfigurationRequirement;
-import ru.arsysop.passage.lic.base.BaseFeaturePermission;
-import ru.arsysop.passage.lic.base.BasePermissionExaminer;
-import ru.arsysop.passage.lic.base.ConfigurationRequirements;
-import ru.arsysop.passage.lic.base.FeaturePermissions;
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.base.LicensingVersions;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
-
 public class BasePermissionExaminerTest {
 
 	private static final String FOO_FEATURE_ID = "foo"; //$NON-NLS-1$
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingConditionsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingConditionsTest.java
similarity index 57%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingConditionsTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingConditionsTest.java
index 3e9fa2e..8d7b458 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingConditionsTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingConditionsTest.java
@@ -1,32 +1,23 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.passage.lic.base.LicensingConditions;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.LicensingConditions;
-
 public class LicensingConditionsTest {
 	
 	@SuppressWarnings("nls")
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingNamespacesTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingNamespacesTest.java
similarity index 58%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingNamespacesTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingNamespacesTest.java
index e150307..ad63acb 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingNamespacesTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingNamespacesTest.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
+import static org.eclipse.passage.lic.base.LicensingNamespaces.*;
 import static org.junit.Assert.assertEquals;
 
-import static ru.arsysop.passage.lic.base.LicensingNamespaces.*;
-
 import org.junit.Test;
 
 public class LicensingNamespacesTest {
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingPropertiesTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingPropertiesTest.java
similarity index 62%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingPropertiesTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingPropertiesTest.java
index 8495a44..2a91f30 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingPropertiesTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingPropertiesTest.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 import static org.junit.Assert.assertEquals;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
-
 import org.junit.Test;
 
 public class LicensingPropertiesTest {
diff --git a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingVersionsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingVersionsTest.java
similarity index 88%
rename from tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingVersionsTest.java
rename to tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingVersionsTest.java
index 1455a33..c3e4373 100644
--- a/tests/ru.arsysop.passage.lic.base.tests/src/ru/arsysop/passage/lic/base/tests/LicensingVersionsTest.java
+++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingVersionsTest.java
@@ -1,27 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base.tests;
+package org.eclipse.passage.lic.base.tests;
 
+import static org.eclipse.passage.lic.base.LicensingVersions.*;
 import static org.junit.Assert.assertEquals;
-import static ru.arsysop.passage.lic.base.LicensingVersions.*;
 
 import org.junit.Test;
 
diff --git a/tests/org.eclipse.passage.lic.bc.tests/.classpath b/tests/org.eclipse.passage.lic.bc.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.bc.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.bc.tests/.project b/tests/org.eclipse.passage.lic.bc.tests/.project
new file mode 100644
index 0000000..3ac750f
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.bc.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.bc.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.bc.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.equinox.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.bc.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/org.eclipse.passage.lic.bc.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.bc.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d3f3e96
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.bc.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.bc.tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.bc.tests
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit;bundle-version="4.12.0",
+ org.eclipse.osgi.services;bundle-version="0.0.0",
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.bc;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..e5015a4
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.bc.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC BC Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.bc.tests/build.properties b/tests/org.eclipse.passage.lic.bc.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.bc.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcPropertiesTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcPropertiesTest.java
similarity index 50%
rename from tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcPropertiesTest.java
rename to tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcPropertiesTest.java
index 2161a11..5da10a1 100644
--- a/tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcPropertiesTest.java
+++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcPropertiesTest.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.bc.tests;
+package org.eclipse.passage.lic.bc.tests;
 
+import static org.eclipse.passage.lic.bc.BcProperties.*;
 import static org.junit.Assert.assertEquals;
 
-import static ru.arsysop.passage.lic.bc.BcProperties.*;
-
 import java.util.HashMap;
 
 import org.junit.Test;
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcStreamCodecTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcStreamCodecTest.java
similarity index 81%
rename from tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcStreamCodecTest.java
rename to tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcStreamCodecTest.java
index 325714d..84c01ae 100644
--- a/tests/ru.arsysop.passage.lic.bc.tests/src/ru/arsysop/passage/lic/bc/tests/BcStreamCodecTest.java
+++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/bc/tests/BcStreamCodecTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.bc.tests;
+package org.eclipse.passage.lic.bc.tests;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -32,15 +24,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.passage.lic.base.LicensingPaths;
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.eclipse.passage.lic.bc.BcProperties;
+import org.eclipse.passage.lic.bc.BcStreamCodec;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import ru.arsysop.passage.lic.base.LicensingPaths;
-import ru.arsysop.passage.lic.base.LicensingProperties;
-import ru.arsysop.passage.lic.bc.BcProperties;
-import ru.arsysop.passage.lic.bc.BcStreamCodec;
-
 @SuppressWarnings("restriction")
 public class BcStreamCodecTest {
 
diff --git a/tests/org.eclipse.passage.lic.equinox.tests/.classpath b/tests/org.eclipse.passage.lic.equinox.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.equinox.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/.project b/tests/org.eclipse.passage.lic.equinox.tests/.project
similarity index 92%
rename from tests/ru.arsysop.passage.lic.equinox.tests/.project
rename to tests/org.eclipse.passage.lic.equinox.tests/.project
index 45835e4..2f389c7 100644
--- a/tests/ru.arsysop.passage.lic.equinox.tests/.project
+++ b/tests/org.eclipse.passage.lic.equinox.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.equinox.tests</name>
+	<name>org.eclipse.passage.lic.equinox.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.equinox.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.integration.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.equinox.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
similarity index 55%
rename from tests/ru.arsysop.passage.lic.equinox.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
index 3c5993f..d08840c 100644
--- a/tests/ru.arsysop.passage.lic.equinox.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.equinox.tests
+Automatic-Module-Name: org.eclipse.passage.lic.equinox.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.equinox.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.equinox.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
@@ -10,5 +10,5 @@ Bundle-Copyright: %Bundle-Copyright
 Require-Bundle: org.junit;bundle-version="0.0.0",
  org.mockito;bundle-version="0.0.0",
  org.eclipse.equinox.event;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.equinox;bundle-version="0.0.0"
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.equinox;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..c333b29
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.equinox.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Equinox Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.equinox.tests/build.properties b/tests/org.eclipse.passage.lic.equinox.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.equinox.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java
similarity index 55%
rename from tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java
rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java
index 3337993..5c5c4f8 100644
--- a/tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java
+++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/ComponentConfigurationResolverTest.java
@@ -1,36 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.equinox.tests;
+package org.eclipse.passage.lic.equinox.tests;
 
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.passage.lic.internal.equinox.ComponentConfigurationResolver;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.runtime.ServiceComponentRuntime;
 import org.osgi.service.log.LoggerFactory;
 
-import ru.arsysop.passage.lic.internal.equinox.ComponentConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-
 @SuppressWarnings("restriction")
 public class ComponentConfigurationResolverTest {
 	
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/EquinoxAccessManagerTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/EquinoxAccessManagerTest.java
similarity index 50%
rename from tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/EquinoxAccessManagerTest.java
rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/EquinoxAccessManagerTest.java
index 29797d3..7ea1016 100644
--- a/tests/ru.arsysop.passage.lic.equinox.tests/src/ru/arsysop/passage/lic/equinox/tests/EquinoxAccessManagerTest.java
+++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/tests/EquinoxAccessManagerTest.java
@@ -1,32 +1,23 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.equinox.tests;
+package org.eclipse.passage.lic.equinox.tests;
 
+import org.eclipse.passage.lic.internal.equinox.EquinoxAccessManager;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.internal.equinox.EquinoxAccessManager;
-
 @SuppressWarnings("restriction")
 public class EquinoxAccessManagerTest {
 	
diff --git a/tests/org.eclipse.passage.lic.integration.tests/.classpath b/tests/org.eclipse.passage.lic.integration.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.integration.tests/.project b/tests/org.eclipse.passage.lic.integration.tests/.project
new file mode 100644
index 0000000..4fe8d81
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.integration.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.json.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.integration.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.json.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.integration.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/org.eclipse.passage.lic.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.integration.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3f21b2c
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.integration.tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.integration.tests
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit;bundle-version="4.12.0",
+ org.eclipse.osgi;bundle-version="0.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
+ org.eclipse.passage.brc.oshi;bundle-version="0.0.0",
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.inspector;bundle-version="0.0.0",
+ org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
+ org.eclipse.passage.lic.bc;bundle-version="0.0.0",
+ org.eclipse.passage.lic.net;bundle-version="0.0.0",
+ org.eclipse.passage.lic.oshi;bundle-version="0.0.0",
+ org.eclipse.passage.lic.registry;bundle-version="0.0.0",
+ org.eclipse.passage.lic.model;bundle-version="0.0.0",
+ org.eclipse.passage.lic.model.core;bundle-version="0.0.0"
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/*.xml
+Provide-Capability: licensing.feature;licensing.feature="some.licensed.bundle",
+ licensing.configuration;licensing.configuration="some.licensed.configuration";keypath="OSGI-INF/key.pub"
diff --git a/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..fd6acec
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.integration.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Integration Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.LicIntegrationComponent.xml b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.LicIntegrationComponent.xml
similarity index 65%
rename from tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.LicIntegrationComponent.xml
rename to tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.LicIntegrationComponent.xml
index dbfe68a..d8da37c 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.LicIntegrationComponent.xml
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.LicIntegrationComponent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.integration.tests.LicIntegrationComponent">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.integration.tests.LicIntegrationComponent">
    <property name="licensing.feature.identifier" value="some.licensed.component"/>
    <property name="licensing.feature.version" value="1.2.0"/>
    <property name="licensing.restriction.level" value="error"/>
-   <implementation class="ru.arsysop.passage.lic.integration.tests.LicIntegrationComponent"/>
+   <implementation class="org.eclipse.passage.lic.integration.tests.LicIntegrationComponent"/>
 </scr:component>
\ No newline at end of file
diff --git a/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml
new file mode 100644
index 0000000..f0382a1
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.passage.lic.integration.tests.OsgiInstallAreaConditionMiner">
+   <implementation class="org.eclipse.passage.lic.equinox.EnvironmentBasedConditionMiner"/>
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.ConditionMiner"/>
+   </service>
+   <reference bind="bindConditionDescriptorTransport" cardinality="1..n" interface="org.eclipse.passage.lic.runtime.io.LicensingConditionTransport" name="ConditionDescriptorTransport" unbind="unbindConditionDescriptorTransport"/>
+   <reference bind="bindEnvironmentInfo" interface="org.eclipse.osgi.service.environment.EnvironmentInfo" name="EnvironmentInfo" unbind="unbindEnvironmentInfo"/>
+   <reference bind="bindKeyKeeper" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.io.KeyKeeper" name="KeyKeeper" unbind="unbindKeyKeeper"/>
+   <reference bind="bindStreamCodec" cardinality="0..n" interface="org.eclipse.passage.lic.runtime.io.StreamCodec" name="StreamCodec" unbind="unbindStreamCodec"/>
+   <property name="licensing.condition.area" type="String" value="osgi.install.area"/>
+</scr:component>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeKeyKeeper.xml b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeKeyKeeper.xml
similarity index 50%
rename from tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeKeyKeeper.xml
rename to tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeKeyKeeper.xml
index 89a327d..3b42c2c 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeKeyKeeper.xml
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeKeyKeeper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="ru.arsysop.passage.lic.integration.tests.SomeKeyKeeper">
-   <implementation class="ru.arsysop.passage.lic.equinox.BundleKeyKeeper"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.passage.lic.integration.tests.SomeKeyKeeper">
+   <implementation class="org.eclipse.passage.lic.equinox.BundleKeyKeeper"/>
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.io.KeyKeeper"/>
+      <provide interface="org.eclipse.passage.lic.runtime.io.KeyKeeper"/>
    </service>
    <property name="licensing.product.identifier" type="String" value="some.encrypted.product"/>
 </scr:component>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeStreamCodec.xml b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeStreamCodec.xml
similarity index 62%
rename from tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeStreamCodec.xml
rename to tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeStreamCodec.xml
index 3c5c499..050399d 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SomeStreamCodec.xml
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SomeStreamCodec.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="ru.arsysop.passage.lic.integration.tests.SomeStreamCodec">
-   <implementation class="ru.arsysop.passage.lic.bc.BcStreamCodec"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.passage.lic.integration.tests.SomeStreamCodec">
+   <implementation class="org.eclipse.passage.lic.bc.BcStreamCodec"/>
    <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.io.StreamCodec"/>
+      <provide interface="org.eclipse.passage.lic.runtime.io.StreamCodec"/>
    </service>
    <property name="licensing.product.identifier" type="String" value="some.encrypted.product"/>
    <property name="licensing.security.key.algo" type="String" value="RSA"/>
diff --git a/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SystemPropertyExecutor.xml b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SystemPropertyExecutor.xml
new file mode 100644
index 0000000..a295095
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/OSGI-INF/org.eclipse.passage.lic.integration.tests.SystemPropertyExecutor.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lic.integration.tests.SystemPropertyExecutor">
+   <service>
+      <provide interface="org.eclipse.passage.lic.runtime.RestrictionExecutor"/>
+   </service>
+   <implementation class="org.eclipse.passage.lic.integration.tests.SystemPropertyExecutor"/>
+</scr:component>
\ No newline at end of file
diff --git a/tests/org.eclipse.passage.lic.integration.tests/build.properties b/tests/org.eclipse.passage.lic.integration.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/AccessManagerIntegrationTest.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/AccessManagerIntegrationTest.java
similarity index 79%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/AccessManagerIntegrationTest.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/AccessManagerIntegrationTest.java
index 84df9f0..c08b9da 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/AccessManagerIntegrationTest.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/AccessManagerIntegrationTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,18 +18,17 @@
 import java.util.Date;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.base.LicensingNamespaces;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.base.LicensingNamespaces;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.oshi.OshiHal;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 public class AccessManagerIntegrationTest extends LicIntegrationBase {
 	
 	private static final String UNDEFINED = "undefined"; //$NON-NLS-1$
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java
similarity index 65%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java
index bc6d75a..72d06ad 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/ConfigurationRequirementIntegrationTest.java
@@ -1,38 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.passage.lic.base.LicensingVersions;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
 import org.junit.Test;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
-
-import ru.arsysop.passage.lic.base.LicensingVersions;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-
 public class ConfigurationRequirementIntegrationTest extends LicIntegrationBase {
 
 	@Test
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java
similarity index 73%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java
index 53a927d..5190649 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/FeaturePermissionIntegrationTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -27,18 +19,17 @@
 import java.util.Date;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.oshi.OshiHal;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 public class FeaturePermissionIntegrationTest extends LicIntegrationBase {
 
 	@Test
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationBase.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationBase.java
similarity index 88%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationBase.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationBase.java
index 2392fa8..ba0aebe 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationBase.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationBase.java
@@ -1,29 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
+import static org.eclipse.passage.lic.base.LicensingPaths.*;
 import static org.junit.Assert.assertNotNull;
 
-import static ru.arsysop.passage.lic.base.LicensingPaths.*;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -35,6 +26,10 @@
 import java.nio.file.attribute.BasicFileAttributes;
 
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
+import org.eclipse.passage.lic.base.LicensingPaths;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.runtime.AccessManager;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -45,11 +40,6 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-import ru.arsysop.passage.lic.base.LicensingPaths;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.runtime.AccessManager;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 public abstract class LicIntegrationBase {
 
 	private static final String EXTENSION_SERVER_SETTINGS = ".settings"; //$NON-NLS-1$
diff --git a/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationComponent.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationComponent.java
new file mode 100644
index 0000000..b9335a3
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicIntegrationComponent.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.integration.tests;
+
+import org.eclipse.passage.lic.base.LicensingProperties;
+import org.osgi.service.component.annotations.Component;
+
+@Component(property = { LicensingProperties.LICENSING_FEATURE_IDENTIFIER + "=some.licensed.component",
+		LicensingProperties.LICENSING_FEATURE_VERSION + '=' + "1.2.0",
+		LicensingProperties.LICENSING_RESTRICTION_LEVEL + '=' + LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR })
+public class LicIntegrationComponent {
+
+}
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicensingConditionIntegrationTest.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicensingConditionIntegrationTest.java
similarity index 80%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicensingConditionIntegrationTest.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicensingConditionIntegrationTest.java
index 904fd10..8f0aee2 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicensingConditionIntegrationTest.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LicensingConditionIntegrationTest.java
@@ -1,40 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.passage.lic.base.LicensingConfigurations;
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.base.LicensingConfigurations;
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.oshi.OshiHal;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 public class LicensingConditionIntegrationTest extends LicIntegrationBase {
 
 	@Test
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LocOfflineEmulator.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LocOfflineEmulator.java
similarity index 66%
rename from tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LocOfflineEmulator.java
rename to tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LocOfflineEmulator.java
index b044467..c5fab9e 100644
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LocOfflineEmulator.java
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/LocOfflineEmulator.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
+package org.eclipse.passage.lic.integration.tests;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,10 +21,9 @@
 
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-import ru.arsysop.passage.lic.bc.BcStreamCodec;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.runtime.io.StreamCodec;
+import org.eclipse.passage.lic.bc.BcStreamCodec;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.runtime.io.StreamCodec;
 
 @SuppressWarnings("restriction")
 public class LocOfflineEmulator {
diff --git a/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/SystemPropertyExecutor.java b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/SystemPropertyExecutor.java
new file mode 100644
index 0000000..e2ab219
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.integration.tests/src/org/eclipse/passage/lic/integration/tests/SystemPropertyExecutor.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.integration.tests;
+
+import org.eclipse.passage.lic.runtime.RestrictionExecutor;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
+import org.osgi.service.component.annotations.Component;
+
+@Component
+public class SystemPropertyExecutor implements RestrictionExecutor {
+
+	@Override
+	public void execute(Iterable<RestrictionVerdict> actions) {
+		for (RestrictionVerdict verdict : actions) {
+			String featureIdentifier = verdict.getConfigurationRequirement().getFeatureIdentifier();
+			String restrictionLevel = verdict.getRestrictionLevel();
+			System.setProperty(featureIdentifier, restrictionLevel);
+		}
+	}
+
+}
diff --git a/tests/org.eclipse.passage.lic.json.tests/.classpath b/tests/org.eclipse.passage.lic.json.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.json.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.json.tests/.project b/tests/org.eclipse.passage.lic.json.tests/.project
new file mode 100644
index 0000000..9e78805
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.json.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.json.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.json.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.model.core.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.json.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/ru.arsysop.passage.lic.json.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.json.tests/META-INF/MANIFEST.MF
similarity index 63%
rename from tests/ru.arsysop.passage.lic.json.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.json.tests/META-INF/MANIFEST.MF
index f3993e6..217e85b 100644
--- a/tests/ru.arsysop.passage.lic.json.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.json.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.json.tests
+Automatic-Module-Name: org.eclipse.passage.lic.json.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.json.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.json.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -11,5 +11,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.9.2",
  com.fasterxml.jackson.core.jackson-core;bundle-version="2.9.2",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="2.9.2",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.json;bundle-version="0.0.0"
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.json;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..76656c2
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.json.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC JSON Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.json.tests/build.properties b/tests/org.eclipse.passage.lic.json.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.json.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java
similarity index 71%
rename from tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java
rename to tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java
index db3e33a..7421f63 100644
--- a/tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java
+++ b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonFeaturePermissionTransportTest.java
@@ -1,4 +1,16 @@
-package ru.arsysop.passage.lic.json.tests;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.json.tests;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -8,23 +20,22 @@
 import java.io.IOException;
 import java.util.Date;
 
+import org.eclipse.passage.lic.base.BaseFeaturePermission;
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+import org.eclipse.passage.lic.base.FeaturePermissions;
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.internal.json.FeaturePermissionAggregator;
+import org.eclipse.passage.lic.internal.json.FeaturePermissionMixln;
+import org.eclipse.passage.lic.internal.json.JsonFeaturePermissionTransport;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 import org.junit.Test;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import ru.arsysop.passage.lic.base.BaseFeaturePermission;
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-import ru.arsysop.passage.lic.base.FeaturePermissions;
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.internal.json.FeaturePermissionAggregator;
-import ru.arsysop.passage.lic.internal.json.FeaturePermissionMixln;
-import ru.arsysop.passage.lic.internal.json.JsonFeaturePermissionTransport;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-
 @SuppressWarnings("restriction")
 public class JsonFeaturePermissionTransportTest {
 
diff --git a/tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/NetConditionDescriptorTransportTest.java b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/NetConditionDescriptorTransportTest.java
similarity index 74%
rename from tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/NetConditionDescriptorTransportTest.java
rename to tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/NetConditionDescriptorTransportTest.java
index 2fa0062..06ec974 100644
--- a/tests/ru.arsysop.passage.lic.json.tests/src/ru/arsysop/passage/lic/json/tests/NetConditionDescriptorTransportTest.java
+++ b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/NetConditionDescriptorTransportTest.java
@@ -1,4 +1,16 @@
-package ru.arsysop.passage.lic.json.tests;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.json.tests;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -8,19 +20,18 @@
 import java.io.IOException;
 import java.util.Date;
 
+import org.eclipse.passage.lic.base.BaseLicensingCondition;
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.internal.json.ConditionDescriptorAggregator;
+import org.eclipse.passage.lic.internal.json.JsonLicensingConditionTransport;
+import org.eclipse.passage.lic.internal.json.LicensingConditionMixIn;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 import org.junit.Test;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import ru.arsysop.passage.lic.base.BaseLicensingCondition;
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.internal.json.ConditionDescriptorAggregator;
-import ru.arsysop.passage.lic.internal.json.JsonLicensingConditionTransport;
-import ru.arsysop.passage.lic.internal.json.LicensingConditionMixIn;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-
 @SuppressWarnings("restriction")
 public class NetConditionDescriptorTransportTest {
 
diff --git a/tests/org.eclipse.passage.lic.model.core.tests/.classpath b/tests/org.eclipse.passage.lic.model.core.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.model.core.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.model.core.tests/.project b/tests/org.eclipse.passage.lic.model.core.tests/.project
new file mode 100644
index 0000000..64f8073
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.model.core.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.model.core.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.net.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.model.core.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.net.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.model.core.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.model.core.tests/META-INF/MANIFEST.MF
similarity index 51%
rename from tests/ru.arsysop.passage.lic.model.core.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.model.core.tests/META-INF/MANIFEST.MF
index c3f162d..555f139 100644
--- a/tests/ru.arsysop.passage.lic.model.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.model.core.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.model.core.tests
+Automatic-Module-Name: org.eclipse.passage.lic.model.core.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.model.core.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.model.core.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model.core;bundle-version="0.0.0"
+ org.eclipse.passage.lic.model;bundle-version="0.0.0",
+ org.eclipse.passage.lic.model.core;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..437e507
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.model.core.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Model Core Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.model.core.tests/build.properties b/tests/org.eclipse.passage.lic.model.core.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.model.core.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/src/ru/arsysop/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java b/tests/org.eclipse.passage.lic.model.core.tests/src/org/eclipse/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java
similarity index 79%
rename from tests/ru.arsysop.passage.lic.model.core.tests/src/ru/arsysop/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java
rename to tests/org.eclipse.passage.lic.model.core.tests/src/org/eclipse/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java
index c677ade..7cdb5ba 100644
--- a/tests/ru.arsysop.passage.lic.model.core.tests/src/ru/arsysop/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java
+++ b/tests/org.eclipse.passage.lic.model.core.tests/src/org/eclipse/passage/lic/model/core/tests/XmiLicensingConditionExtractorTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.model.core.tests;
+package org.eclipse.passage.lic.model.core.tests;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,16 +24,15 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+import org.eclipse.passage.lic.model.api.LicenseGrant;
+import org.eclipse.passage.lic.model.api.LicensePack;
+import org.eclipse.passage.lic.model.core.XmiLicensingConditionExtractor;
+import org.eclipse.passage.lic.model.meta.LicFactory;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import ru.arsysop.passage.lic.model.api.LicenseGrant;
-import ru.arsysop.passage.lic.model.api.LicensePack;
-import ru.arsysop.passage.lic.model.core.XmiLicensingConditionExtractor;
-import ru.arsysop.passage.lic.model.meta.LicFactory;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-
 public class XmiLicensingConditionExtractorTest {
 
 	private static final String COND1_FEATURE_ID = "loc.workbench"; //$NON-NLS-1$
diff --git a/tests/org.eclipse.passage.lic.net.tests/.classpath b/tests/org.eclipse.passage.lic.net.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.net.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.net.tests/.project b/tests/org.eclipse.passage.lic.net.tests/.project
new file mode 100644
index 0000000..c0588e6
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.net.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.net.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.net.tests/.settings/org.sonarlint.eclipse.core.prefs
similarity index 100%
rename from tests/ru.arsysop.passage.lic.oshi.tests/.settings/org.sonarlint.eclipse.core.prefs
rename to tests/org.eclipse.passage.lic.net.tests/.settings/org.sonarlint.eclipse.core.prefs
diff --git a/tests/ru.arsysop.passage.lic.net.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.net.tests/META-INF/MANIFEST.MF
similarity index 64%
rename from tests/ru.arsysop.passage.lic.net.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.net.tests/META-INF/MANIFEST.MF
index c8abf26..ab4ddc9 100644
--- a/tests/ru.arsysop.passage.lic.net.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.net.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.net.tests
+Automatic-Module-Name: org.eclipse.passage.lic.net.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.net.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.net.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -14,6 +14,6 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.mockito;bundle-version="0.0.0",
  org.eclipse.osgi;bundle-version="0.0.0",
  org.eclipse.osgi.services;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.net;bundle-version="0.0.0"
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.net;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..efcf08b
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.net.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Net Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.net.tests/build.properties b/tests/org.eclipse.passage.lic.net.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.net.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/NtpConditionEvaluatorTest.java b/tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/NtpConditionEvaluatorTest.java
similarity index 79%
rename from tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/NtpConditionEvaluatorTest.java
rename to tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/NtpConditionEvaluatorTest.java
index 67a97de..0ef5685 100644
--- a/tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/NtpConditionEvaluatorTest.java
+++ b/tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/NtpConditionEvaluatorTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.net.tests;
+package org.eclipse.passage.lic.net.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,16 +22,15 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.internal.net.NtpConditionEvaluator;
+import org.eclipse.passage.lic.net.TimeConditions;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.internal.net.NtpConditionEvaluator;
-import ru.arsysop.passage.lic.net.TimeConditions;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-
 @SuppressWarnings("restriction")
 public class NtpConditionEvaluatorTest {
 
diff --git a/tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/TimeConditionsTest.java b/tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/TimeConditionsTest.java
similarity index 53%
rename from tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/TimeConditionsTest.java
rename to tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/TimeConditionsTest.java
index e685e27..e190b95 100644
--- a/tests/ru.arsysop.passage.lic.net.tests/src/ru/arsysop/passage/lic/net/tests/TimeConditionsTest.java
+++ b/tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/TimeConditionsTest.java
@@ -1,32 +1,23 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.net.tests;
+package org.eclipse.passage.lic.net.tests;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.passage.lic.net.TimeConditions;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.net.TimeConditions;
-
 public class TimeConditionsTest {
 	
 	@Test
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/.classpath b/tests/org.eclipse.passage.lic.oshi.tests/.classpath
new file mode 100644
index 0000000..f193818
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/.project b/tests/org.eclipse.passage.lic.oshi.tests/.project
new file mode 100644
index 0000000..4f8dfd1
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.oshi.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/.settings/org.sonarlint.eclipse.core.prefs b/tests/org.eclipse.passage.lic.oshi.tests/.settings/org.sonarlint.eclipse.core.prefs
new file mode 100644
index 0000000..2bfe394
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/.settings/org.sonarlint.eclipse.core.prefs
@@ -0,0 +1,4 @@
+autoEnabled=false
+eclipse.preferences.version=1
+extraProperties=
+fileExclusions=
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.oshi.tests/META-INF/MANIFEST.MF
similarity index 50%
rename from tests/ru.arsysop.passage.lic.oshi.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.passage.lic.oshi.tests/META-INF/MANIFEST.MF
index 4af79a0..6ee88cf 100644
--- a/tests/ru.arsysop.passage.lic.oshi.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.oshi.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.oshi.tests
+Automatic-Module-Name: org.eclipse.passage.lic.oshi.tests
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.oshi.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-SymbolicName: org.eclipse.passage.lic.oshi.tests
+Bundle-Version: 0.3.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -11,7 +11,7 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.slf4j.api;bundle-version="0.0.0",
  org.mockito;bundle-version="0.0.0",
  org.eclipse.osgi.services;bundle-version="0.0.0",
- ru.arsysop.passage.brc.oshi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.oshi;bundle-version="0.0.0"
+ org.eclipse.passage.brc.oshi;bundle-version="0.0.0",
+ org.eclipse.passage.lic.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;bundle-version="0.0.0",
+ org.eclipse.passage.lic.oshi;bundle-version="0.0.0"
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..845304d
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.oshi.tests
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC OSHI Tests
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/build.properties b/tests/org.eclipse.passage.lic.oshi.tests/build.properties
new file mode 100644
index 0000000..9275df7
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java
similarity index 78%
rename from tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java
rename to tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java
index 582600f..14c002b 100644
--- a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java
+++ b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiConditionEvaluatorTest.java
@@ -1,24 +1,16 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.oshi.tests;
+package org.eclipse.passage.lic.oshi.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,16 +22,15 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.eclipse.passage.lic.base.LicensingConditions;
+import org.eclipse.passage.lic.internal.oshi.OshiConditionEvaluator;
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.service.log.LogService;
 
-import ru.arsysop.passage.lic.base.LicensingConditions;
-import ru.arsysop.passage.lic.internal.oshi.OshiConditionEvaluator;
-import ru.arsysop.passage.lic.oshi.OshiHal;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-
 @SuppressWarnings("restriction")
 public class OshiConditionEvaluatorTest {
 
diff --git a/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHalTest.java b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHalTest.java
new file mode 100644
index 0000000..49f642e
--- /dev/null
+++ b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHalTest.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.oshi.tests;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+import org.eclipse.passage.lic.oshi.OshiHal;
+import org.junit.Test;
+
+public class OshiHalTest {
+
+	@Test
+	public void testExtractPropertyNegative() throws Exception {
+		assertNull(OshiHal.extractProperty(null));
+		assertNull(OshiHal.extractProperty(new String()));
+		assertFalse(OshiHal.evaluateProperty(null, null));
+	}
+
+}
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHardwareInspectorTest.java b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHardwareInspectorTest.java
similarity index 66%
rename from tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHardwareInspectorTest.java
rename to tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHardwareInspectorTest.java
index 3e97517..204e1b5 100644
--- a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHardwareInspectorTest.java
+++ b/tests/org.eclipse.passage.lic.oshi.tests/src/org/eclipse/passage/lic/oshi/tests/OshiHardwareInspectorTest.java
@@ -1,4 +1,16 @@
-package ru.arsysop.passage.lic.oshi.tests;
+/*******************************************************************************
+ * Copyright (c) 2018-2019 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.oshi.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -8,30 +20,10 @@
 import java.io.IOException;
 import java.util.stream.StreamSupport;
 
+import org.eclipse.passage.lic.inspector.HardwareInspector;
+import org.eclipse.passage.lic.internal.oshi.OshiHardwareInspector;
 import org.junit.Test;
 
-import ru.arsysop.passage.lic.inspector.HardwareInspector;
-import ru.arsysop.passage.lic.internal.oshi.OshiHardwareInspector;
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
 @SuppressWarnings("restriction")
 public class OshiHardwareInspectorTest {
 	
diff --git a/tests/pom.xml b/tests/pom.xml
index 1479ea0..3b28d34 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation
@@ -26,14 +18,14 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>ru.arsysop.passage.lic.tests</artifactId>
+	<artifactId>org.eclipse.passage.lic.tests</artifactId>
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>ru.arsysop.passage.lic</groupId>
-		<artifactId>ru.arsysop.passage.lic.parent</artifactId>
-		<version>0.3.2</version>
-		<relativePath>../releng/ru.arsysop.passage.lic.parent</relativePath>
+		<groupId>org.eclipse.passage.lic</groupId>
+		<artifactId>org.eclipse.passage.lic.parent</artifactId>
+		<version>0.3.3</version>
+		<relativePath>../releng/org.eclipse.passage.lic.parent</relativePath>
 	</parent>
 
 </project>
\ No newline at end of file
diff --git a/tests/ru.arsysop.passage.lic.base.tests/.classpath b/tests/ru.arsysop.passage.lic.base.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.base.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 122ddcd..0000000
--- a/tests/ru.arsysop.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.base.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Base Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.base.tests/build.properties b/tests/ru.arsysop.passage.lic.base.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.base.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/.classpath b/tests/ru.arsysop.passage.lic.bc.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.bc.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/META-INF/MANIFEST.MF b/tests/ru.arsysop.passage.lic.bc.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index df484e5..0000000
--- a/tests/ru.arsysop.passage.lic.bc.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.bc.tests
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.bc.tests
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.osgi.services;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.bc;bundle-version="0.0.0"
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 3b441ec..0000000
--- a/tests/ru.arsysop.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.bc.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC BC Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.bc.tests/build.properties b/tests/ru.arsysop.passage.lic.bc.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.bc.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/.classpath b/tests/ru.arsysop.passage.lic.equinox.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.equinox.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 7c80661..0000000
--- a/tests/ru.arsysop.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.equinox.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Equinox Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.equinox.tests/build.properties b/tests/ru.arsysop.passage.lic.equinox.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.equinox.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/.classpath b/tests/ru.arsysop.passage.lic.integration.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/.project b/tests/ru.arsysop.passage.lic.integration.tests/.project
deleted file mode 100644
index f6e7548..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.integration.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/META-INF/MANIFEST.MF b/tests/ru.arsysop.passage.lic.integration.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 0fe20af..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: ru.arsysop.passage.lic.integration.tests
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ru.arsysop.passage.lic.integration.tests
-Bundle-Version: 0.3.2.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.osgi;bundle-version="0.0.0",
- org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.runtime;bundle-version="0.0.0",
- ru.arsysop.passage.lic.base;bundle-version="0.0.0",
- ru.arsysop.passage.lic.inspector;bundle-version="0.0.0",
- ru.arsysop.passage.lic.equinox;bundle-version="0.0.0",
- ru.arsysop.passage.lic.bc;bundle-version="0.0.0",
- ru.arsysop.passage.lic.net;bundle-version="0.0.0",
- ru.arsysop.passage.lic.oshi;bundle-version="0.0.0",
- ru.arsysop.passage.lic.registry;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model;bundle-version="0.0.0",
- ru.arsysop.passage.lic.model.core;bundle-version="0.0.0"
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/*.xml
-Provide-Capability: licensing.feature;licensing.feature="some.licensed.bundle",
- licensing.configuration;licensing.configuration="some.licensed.configuration";keypath="OSGI-INF/key.pub"
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 77109c9..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.integration.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Integration Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml b/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml
deleted file mode 100644
index 0e74a6e..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.OsgiInstallAreaConditionMiner.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="ru.arsysop.passage.lic.integration.tests.OsgiInstallAreaConditionMiner">
-   <implementation class="ru.arsysop.passage.lic.equinox.EnvironmentBasedConditionMiner"/>
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.ConditionMiner"/>
-   </service>
-   <reference bind="bindConditionDescriptorTransport" cardinality="1..n" interface="ru.arsysop.passage.lic.runtime.io.LicensingConditionTransport" name="ConditionDescriptorTransport" unbind="unbindConditionDescriptorTransport"/>
-   <reference bind="bindEnvironmentInfo" interface="org.eclipse.osgi.service.environment.EnvironmentInfo" name="EnvironmentInfo" unbind="unbindEnvironmentInfo"/>
-   <reference bind="bindKeyKeeper" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.io.KeyKeeper" name="KeyKeeper" unbind="unbindKeyKeeper"/>
-   <reference bind="bindStreamCodec" cardinality="0..n" interface="ru.arsysop.passage.lic.runtime.io.StreamCodec" name="StreamCodec" unbind="unbindStreamCodec"/>
-   <property name="licensing.condition.area" type="String" value="osgi.install.area"/>
-</scr:component>
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SystemPropertyExecutor.xml b/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SystemPropertyExecutor.xml
deleted file mode 100644
index 3de2870..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/OSGI-INF/ru.arsysop.passage.lic.integration.tests.SystemPropertyExecutor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ru.arsysop.passage.lic.integration.tests.SystemPropertyExecutor">
-   <service>
-      <provide interface="ru.arsysop.passage.lic.runtime.RestrictionExecutor"/>
-   </service>
-   <implementation class="ru.arsysop.passage.lic.integration.tests.SystemPropertyExecutor"/>
-</scr:component>
\ No newline at end of file
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/build.properties b/tests/ru.arsysop.passage.lic.integration.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationComponent.java b/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationComponent.java
deleted file mode 100644
index b3de566..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/LicIntegrationComponent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
-
-import org.osgi.service.component.annotations.Component;
-
-import ru.arsysop.passage.lic.base.LicensingProperties;
-
-@Component(property = { LicensingProperties.LICENSING_FEATURE_IDENTIFIER + "=some.licensed.component",
-		LicensingProperties.LICENSING_FEATURE_VERSION + '=' + "1.2.0",
-		LicensingProperties.LICENSING_RESTRICTION_LEVEL + '=' + LicensingProperties.LICENSING_RESTRICTION_LEVEL_ERROR })
-public class LicIntegrationComponent {
-
-}
diff --git a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/SystemPropertyExecutor.java b/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/SystemPropertyExecutor.java
deleted file mode 100644
index a781f18..0000000
--- a/tests/ru.arsysop.passage.lic.integration.tests/src/ru/arsysop/passage/lic/integration/tests/SystemPropertyExecutor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.integration.tests;
-
-import org.osgi.service.component.annotations.Component;
-
-import ru.arsysop.passage.lic.runtime.RestrictionExecutor;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
-
-@Component
-public class SystemPropertyExecutor implements RestrictionExecutor {
-
-	@Override
-	public void execute(Iterable<RestrictionVerdict> actions) {
-		for (RestrictionVerdict verdict : actions) {
-			String featureIdentifier = verdict.getConfigurationRequirement().getFeatureIdentifier();
-			String restrictionLevel = verdict.getRestrictionLevel();
-			System.setProperty(featureIdentifier, restrictionLevel);
-		}
-	}
-
-}
diff --git a/tests/ru.arsysop.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 290ad43..0000000
--- a/tests/ru.arsysop.passage.lic.json.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.json.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC JSON Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.json.tests/build.properties b/tests/ru.arsysop.passage.lic.json.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.json.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/.classpath b/tests/ru.arsysop.passage.lic.model.core.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.model.core.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/.project b/tests/ru.arsysop.passage.lic.model.core.tests/.project
deleted file mode 100644
index c606598..0000000
--- a/tests/ru.arsysop.passage.lic.model.core.tests/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<projectDescription>
-	<name>ru.arsysop.passage.lic.model.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index cbcc1b9..0000000
--- a/tests/ru.arsysop.passage.lic.model.core.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.model.core.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Model Core Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.model.core.tests/build.properties b/tests/ru.arsysop.passage.lic.model.core.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.model.core.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.net.tests/.classpath b/tests/ru.arsysop.passage.lic.net.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.net.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 429ff53..0000000
--- a/tests/ru.arsysop.passage.lic.net.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.net.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Net Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.net.tests/build.properties b/tests/ru.arsysop.passage.lic.net.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.net.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/.classpath b/tests/ru.arsysop.passage.lic.oshi.tests/.classpath
deleted file mode 100644
index f1eb2e5..0000000
--- a/tests/ru.arsysop.passage.lic.oshi.tests/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018 ArSysOp
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-	SPDX-License-Identifier: Apache-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/.project b/tests/ru.arsysop.passage.lic.oshi.tests/.project
deleted file mode 100644
index c43d099..0000000
--- a/tests/ru.arsysop.passage.lic.oshi.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ru.arsysop.passage.lic.oshi.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties b/tests/ru.arsysop.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 3470ed6..0000000
--- a/tests/ru.arsysop.passage.lic.oshi.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#Properties file for ru.arsysop.passage.lic.oshi.tests
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC OSHI Tests
-Bundle-Vendor = ArSysOp
-Bundle-Copyright = Copyright (c) 2018 ArSysOp
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/build.properties b/tests/ru.arsysop.passage.lic.oshi.tests/build.properties
deleted file mode 100644
index 449b823..0000000
--- a/tests/ru.arsysop.passage.lic.oshi.tests/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2018 ArSysOp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
diff --git a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHalTest.java b/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHalTest.java
deleted file mode 100644
index e78282c..0000000
--- a/tests/ru.arsysop.passage.lic.oshi.tests/src/ru/arsysop/passage/lic/oshi/tests/OshiHalTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 ArSysOp
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package ru.arsysop.passage.lic.oshi.tests;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-import ru.arsysop.passage.lic.oshi.OshiHal;
-
-public class OshiHalTest {
-
-	@Test
-	public void testExtractPropertyNegative() throws Exception {
-		assertNull(OshiHal.extractProperty(null));
-		assertNull(OshiHal.extractProperty(new String()));
-		assertFalse(OshiHal.evaluateProperty(null, null));
-	}
-
-}