diff --git a/pom.xml b/pom.xml
index c8984dbf9..48d57c254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
         <module>aem-authoring-toolkit-api</module>
         <module>aem-authoring-toolkit-plugin</module>
         <module>aem-authoring-toolkit-assets</module>
-        <module>samples</module>
     </modules>
 
     <properties>
diff --git a/samples/README.md b/samples/README.md
index 80c6c26c9..f0541c919 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -1,48 +1,61 @@
 # AEM Authoring Toolkit Samples
 
-**AEM Authoring Toolkit Samples** is an example of using AEM Authoring Toolkit functionality in the form of components set. Here you can find examples of using all AAT annotations, examples of custom annotation and dependsOn actions.
+This project contains examples of using *AEM Authoring Toolkit* functionality via several AEM components. Here you can find many built-in and custom *Toolkit* annotations, as well as *DependsOn* annotations and actions.
 
 ## Table of contents
-1. [Annotations map](#annotations-map)
+1. [Project structure and installation](#project-structure-and-installation)
+2. [Annotations reference](#annotations-reference)
     - [@Dialog, @DialogField, @Tab, @PlaceOnTab](#dialog-dialogfield-tab-placeontab)
     - [@Autocomplete](#autocomplete)
     - [@Attribute](#attribute)
     - [@Checkbox](#checkbox)
     - [@ColorField](#colorfield)
     - [@DatePicker](#datepicker)
+    - [@EditConfig, @InplaceEditingConfig](#editconfig-inplaceeditingconfig)
     - [@Extends](#extends)
+    - [@FieldSet](#fieldset)
     - [@ImageUpload (@FileUpload)](#imageupload-fileupload)
     - [@Hidden](#hidden)
+    - [@MultiField](#multifield)
     - [@NumberField](#numberfield)
     - [@Password](#password)
     - [@PathField](#pathfield)
     - [@Properties, @Property](#properties-property)
     - [@RadioGroup](#radiogroup)
+    - [@RichTextEditor, @IconMapping, @HtmlPasteRules, @HtmlLinkRules, @Characters, @ParagraphFormat, @Style](#richtexteditor-iconmapping-htmlpasterules-htmllinkrules-characters-paragraphformat-style)
     - [@Select, @Option](#select-option)
     - [@Switch](#switch)
     - [@TextArea](#textarea)
     - [@TextField](#textfield)
-    - [@FieldSet](#fieldset)
-    - [@MultiField](#multifield)
-    - [@RichTextEditor, @IconMapping, @HtmlPasteRules, @HtmlLinkRules, @Characters, @ParagraphFormat, @Style](#richtexteditor-iconmapping-htmlpasterules-htmllinkrules-characters-paragraphformat-style)
-    - [@EditConfig, @InplaceEditingConfig](#editconfig-inplaceeditingconfig)
-2. [Custom annotations and handlers](#custom-annotations-and-handlers)
-3. [DependsOn](#dependson-plugin)
+3. [Custom annotations and handlers](#custom-annotations-and-handlers)
+4. [DependsOn](#dependson-plugin)
     - [@DependsOn](#dependson)
     - [@DependsOnRef](#dependsonref)
     - [@DependsOnTab](#dependsontab)
     - [@DependsOnParam](#dependsonparam)
+    
+
+## Project structure and installation    
+The project consists of three modules: the **core** module containing *Toolkit*-annotated Sling models; the **apps** module that contains matching AEM components; and the **content** module used to deploy sandboxing pages and supplementary AEM entities. 
+
+To compile and install the project's artifacts to the local Maven repository use `mvn clean install` command. To deploy the installation to an arbitrary AEM instance, run `mvn clean install -Pinstall-samples`. 
+
+The content is deployed to *http://localhost:4502* by default; however you can control the target with the additional command line switches like `-Dhost=some_host`, `-Dport=XXXX`.
+
+You can also control the version of `AEM Authoring Toolkit` API and Maven plugin called by the project. To do this, use the command line switch `-Daat.version=<arbitrary release or snapshot>`.
+
+
 ***
 
-## Annotations map
+## Annotations reference
 
-Sling models with the examples are placed in the module `toolkit-samples.core` package `com.exadel.aem.toolkit.samples.models`.
+Sling models with the examples are placed in the **core** module.
     
 #### `@Dialog`, `@DialogField`, `@Tab`, `@PlaceOnTab`
 
-These annotations are used in every model (just there is no `@PlaceOnTab` in the HomelandComponent).
+These annotations are used in nearly every model.
 
-  * Tab in the form of a nested class is used in the [**HomelandComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/HomelandComponent.java).
+  * Tab in the form of a nested class is used in the [HomelandComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/HomelandComponent.java).
   
   ```
     @Dialog(
@@ -58,7 +71,7 @@ These annotations are used in every model (just there is no `@PlaceOnTab` in the
     }
   ```
     
-  * Tabs in the form of an array of `@Tab` within `@Dialog` are used in the **all** models _except_ HomelandComponent.
+  * Tabs in the form of an array of `@Tab` within `@Dialog` are used in all models except for HomelandComponent.
     
   ```
     @Dialog(
@@ -82,49 +95,43 @@ These annotations are used in every model (just there is no `@PlaceOnTab` in the
     }
   ```
 
-***
-
 #### `@Autocomplete`
 
-`@Autocomplete` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
-
-***
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
 
 #### `@Attribute`
 
-`@Attribute` annotation is used in the [**ShoppingListComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
-
-***
+This annotation is used in the [ShoppingListComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
 
 #### `@Checkbox`
 
-`@Checkbox` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
-
-***
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
 
 #### `@ColorField`
 
-`@ColorField` annotation is used in the [**ArmorColorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ArmorColorComponent.java).
-
-***
+This annotation is used in the [ArmorColorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ArmorColorComponent.java).
 
 #### `@DatePicker`
 
-`@DatePicker` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
 
-***
+#### `@EditConfig`, `@InplaceEditingConfig`
+
+`@EditConfig` and `@InplaceEditingConfig` are used in the [WarriorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
 
 #### `@Extends`
 
-`@Extends` annotation is used in the [**DungeonsComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
+`@Extends` is used in the [DungeonsComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
 
-***
+#### `@FieldSet`
+
+This annotation is used in the [ArmorColorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ArmorColorComponent.java) and [ShoppingListComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
 
 #### `@ImageUpload`, `@FileUpload`
 
-`@ImageUpload` annotation is used in the [**HomelandComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/HomelandComponent.java) and is a special case of the `@FileUpload`.
+`@ImageUpload` is used in the [HomelandComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/HomelandComponent.java).
 
-`@FileUpload` annotation is used similarly:
+`@FileUpload` is generally used in a similar manner:
 
 ```java
 public class FileUploadDialog {
@@ -142,108 +149,76 @@ public class FileUploadDialog {
         icon = "dataUpload",
         iconSize = IconSize.SMALL
     )
-    String currentDate;
+    String file;
 }
 ```
 
-***
-
 #### `@Hidden`
 
-`@Hidden` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
 
-***
+#### `@MultiField`
 
-#### `@NumberField`
+`@MultiField` is used in the [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java).
 
-`@NumberField` annotation is used in the [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java).
+#### `@NumberField`
 
-***
+This annotation is used in the [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java).
 
 #### `@Password`
 
-`@Password` annotation is used in the [**SecretInfoComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/SecretInfoComponent.java).
-
-***
+This annotation is used in the [SecretInfoComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/SecretInfoComponent.java).
 
 #### `@PathField`
 
-`@PathField` annotation is used in the [**WarriorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
-
-***
+This annotation is used in the [WarriorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
 
 #### `@Properties`, `@Property`
 
-`@Properties` and `@Property` annotations are used in the [**DungeonsComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java) to override children of extended `@Select`.
+`@Properties` and `@Property` are used in the [DungeonsComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java) to override children of extended `@Select`.
 
-***
 
 #### `@RadioGroup`
 
-`@RadioGroup` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java).
 
-***
+#### `@RichTextEditor`, `@IconMapping`, `@HtmlPasteRules`, `@HtmlLinkRules`, `@Characters`, `@ParagraphFormat`, `@Style`
+
+These annotations are used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) and [DungeonsComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
 
 #### `@Select`, `@Option`
 
-`@Select` and `@Option` annotations are used in the [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) and [**DungeonsComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
-
-***
+`@Select` and `@Option` are used in the [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) and [**DungeonsComponent**](./core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
 
 #### `@Switch`
 
-`@Switch` annotation is used in the [**WarriorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
+This annotation is used in the [WarriorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
 
-***
 
 #### `@TextArea`
 
-`@TextArea` annotation is used in the [**SecretInfoComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/SecretInfoComponent.java).
-
-***
+This annotation is used in the [SecretInfoComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/SecretInfoComponent.java).
 
 #### `@TextField`
 
-`@TextField` annotation is used in the [**WarriorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java), [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) and [**ShoppingListComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
-
-***
-
-#### `@FieldSet`
-
-`@FieldSet` annotation is used in the [**ArmorColorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ArmorColorComponent.java) and [**ShoppingListComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
-
-***
-
-#### `@MultiField`
-
-`@MultiField` annotation is used in the [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java).
-
-***
-
-#### `@RichTextEditor`, `@IconMapping`, `@HtmlPasteRules`, `@HtmlLinkRules`, `@Characters`, `@ParagraphFormat`, `@Style`
-
-These annotations are used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) and [**DungeonsComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/DungeonsComponent.java).
+This annotation is used in the [WarriorComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java), [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) and [ShoppingListComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java).
 
 ***
 
-#### `@EditConfig`, `@InplaceEditingConfig`
+## Custom annotations and handlers
 
-`@EditConfig` and `@InplaceEditingConfig` annotations are used in the [**WarriorComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorComponent.java).
+An instance of a custom annotation is used to implement the *field name postfix" feature for the `@FieldSet`. 
+The example is placed in the the **core** module (package `com.exadel.aem.toolkit.samples.annotations`).
+Annotation handler is placed in the package `com.exadel.aem.toolkit.samples.annotations.handlers`.
 
 ***
 
-## Custom annotations and handlers
-
-Let's look at custom annotation as an example of a postfix for `@FieldSet`. 
-The example is placed in the the module `toolkit-samples.core` package `com.exadel.aem.toolkit.samples.annotations`.
-Annotation handler is placed in the package `com.exadel.aem.toolkit.samples.annotations.handlers`
-
 ## DependsOn Plugin
 
 #### `@DependsOn`
 
-`@DependsOn` annotation is used in the:
- - [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) 
+This annotation is used in:
+ - [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) 
     - to switch visibility (default action) of a multifield with the simple boolean query:
    ```
    @DependsOn(query = "@ability === 'magic'")
@@ -256,46 +231,40 @@ Annotation handler is placed in the package `com.exadel.aem.toolkit.samples.anno
        params = { @DependsOnParam(name = "msg", value = "Too powerful!")}
    )
    ```
- - [**WarriorDescriptionComponent**](./toolkit-samples-core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) 
-   - to get property 'colorTheme' from the following path:
+ - [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) 
+   - to get *colorTheme* property from the following path:
    ```
    @DependsOn(
        query = "'../../colorTheme'",
        action = DependsOnActions.FETCH
    )
    ```
-   - to call custom action, that changes tags scope of `@Autocomplete` depending on a color theme:
+   - to call custom action that changes tags scope of `@Autocomplete` depending on a color theme:
    ```
    @DependsOn(query = "@isDarkColorTheme", action = "namespaceFilter") 
    ```
- - [**ShoppingListComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java) to switch visibility and disable a textfield with the group boolean query (using back-forward class selector); 
- and to set default text for a textfield depending on a textfield's state:
+ - [ShoppingListComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java) to switch visibility and disable a textfield with the group boolean query (using back-forward class selector); 
+ and to set default text for a textfield depending on its state:
    ```
    @DependsOn(query = "@@checkbox(coral-panel |> .products-fieldSet).every(item => item)")
    @DependsOn(query = "@@checkbox.every(item => item)", action = DependsOnActions.DISABLED)
    @DependsOn(query = "AATSamples.getShoppingDefaultText(@@checkbox(coral-panel |> .weapon-fieldSet), @this)", action = DependsOnActions.SET)
    ``` 
 
-***
-
 #### `@DependsOnRef`
 
-`@DependsOnRef` annotation is used in the [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java), [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) and [**ShoppingListComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java)
-
-***
+This annotation is used in [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java), [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java), and [ShoppingListComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/ShoppingListComponent.java)
 
 #### `@DependsOnTab`
 
-`@DependsOnTab` annotation is used in the [**WarriorDescriptionComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) to switch visibility of tabs with simple boolean queries:
-
-    ```
+This annotation is used in the [WarriorDescriptionComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/WarriorDescriptionComponent.java) to switch visibility of tabs with simple boolean queries:
+    
     @DependsOnTab(tabTitle = WarriorDescriptionComponent.TAB_FRUITS, query = "@likesFruit")
     @DependsOnTab(tabTitle = WarriorDescriptionComponent.TAB_MOVIES, query = "@likesMovies")
-    ```
 
 #### `@DependsOnParam`
 
-`@DependsOnParam` annotation is used in the [**AbilitiesComponent**](./toolkit-samples.core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) to show custom validation message:
+This annotation is used in the [AbilitiesComponent](./core/src/main/java/com/exadel/aem/toolkit/samples/models/AbilitiesComponent.java) to show custom validation message:
    ```
    @DependsOn(
        query = "@this.length <= 3",
@@ -303,5 +272,5 @@ Annotation handler is placed in the package `com.exadel.aem.toolkit.samples.anno
        params = { @DependsOnParam(name = "msg", value = "Too powerful!")}
    )
    ```
-Custom dependsOn actions are placed in the [`abilities-component`](./toolkit-samples.apps/src/main/content/jcr_root/apps/authoring-toolkit/samples/components/content/abilities-component/clientlib/authoring/altVisibility.js) and [`warrior-description-component`](./toolkit-samples.apps/src/main/content/jcr_root/apps/authoring-toolkit/samples/components/content/warrior-description-component/clientlib/authoring).
+Custom *DependsOn* actions are placed in the [`abilities-component`](./apps/src/main/content/jcr_root/apps/authoring-toolkit/samples/components/content/abilities-component/clientlib/authoring/altVisibility.js) and [`warrior-description-component`](./apps/src/main/content/jcr_root/apps/authoring-toolkit/samples/components/content/warrior-description-component/clientlib/authoring) folders.
 
diff --git a/samples/apps/pom.xml b/samples/apps/pom.xml
index cd4c9e8bf..7f1e5fe42 100644
--- a/samples/apps/pom.xml
+++ b/samples/apps/pom.xml
@@ -15,7 +15,27 @@
     <version>1.2.1-SNAPSHOT</version>
 
     <build>
-        <finalName>aem-dialog-plugin-sandbox-apps-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/content/jcr_root</directory>
+                <excludes>
+                    <exclude>**/*.vlt/**</exclude>
+                    <exclude>**/*.vlt</exclude>
+                    <exclude>**/*.DS_Store</exclude>
+                </excludes>
+                <targetPath>.</targetPath>
+            </resource>
+            <resource>
+                <directory>src/main/content/META-INF</directory>
+                <excludes>
+                    <exclude>**/*.vlt/**</exclude>
+                    <exclude>**/*.vlt</exclude>
+                    <exclude>**/*.DS_Store</exclude>
+                </excludes>
+                <targetPath>../vault-work/META-INF</targetPath>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -27,7 +47,24 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
+                <groupId>com.day.jcr.vault</groupId>
+                <artifactId>content-package-maven-plugin</artifactId>
+                <configuration>
+                    <embeddeds>
+                        <embedded>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>aem-authoring-toolkit-samples-core</artifactId>
+                            <target>/apps/${project.jcrAppFolder}/install</target>
+                        </embedded>
+                    </embeddeds>
+                    <subPackages>
+                        <subPackage>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>aem-authoring-toolkit-assets</artifactId>
+                            <filter>true</filter>
+                        </subPackage>
+                    </subPackages>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -36,52 +73,23 @@
         <profile>
             <id>install-samples</id>
             <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/content/jcr_root</directory>
-                        <excludes>
-                            <exclude>**/*.vlt/**</exclude>
-                            <exclude>**/*.vlt</exclude>
-                            <exclude>**/*.DS_Store</exclude>
-                        </excludes>
-                        <targetPath>.</targetPath>
-                    </resource>
-                    <resource>
-                        <directory>src/main/content/META-INF</directory>
-                        <excludes>
-                            <exclude>**/*.vlt/**</exclude>
-                            <exclude>**/*.vlt</exclude>
-                            <exclude>**/*.DS_Store</exclude>
-                        </excludes>
-                        <targetPath>../vault-work/META-INF</targetPath>
-                    </resource>
-                </resources>
                 <plugins>
                     <plugin>
                         <groupId>com.day.jcr.vault</groupId>
                         <artifactId>content-package-maven-plugin</artifactId>
-                        <configuration>
-                            <embeddeds>
-                                <embedded>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>aem-authoring-toolkit-samples-core</artifactId>
-                                    <target>/apps/${project.jcrAppFolder}/install</target>
-                                </embedded>
-                            </embeddeds>
-                            <subPackages>
-                                <subPackage>
-                                    <groupId>com.exadel.aem</groupId>
-                                    <artifactId>aem-authoring-toolkit-assets</artifactId>
-                                    <filter>true</filter>
-                                </subPackage>
-                            </subPackages>
-                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>Installing AEM package</id>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>com.exadel.aem</groupId>
                         <artifactId>aem-authoring-toolkit-plugin</artifactId>
                         <configuration>
-                            <!-- Place here the path to the node under which your component nodes are stored -->
                             <componentsPathBase>jcr_root/apps/${project.jcrAppFolder}/components</componentsPathBase>
                         </configuration>
                     </plugin>
@@ -100,9 +108,9 @@
             <artifactId>aem-authoring-toolkit-samples-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.exadel.aem</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>aem-authoring-toolkit-assets</artifactId>
-            <type>content-package</type>
+            <type>zip</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/samples/content/pom.xml b/samples/content/pom.xml
index 368c41ffc..3eef53fbd 100644
--- a/samples/content/pom.xml
+++ b/samples/content/pom.xml
@@ -15,10 +15,40 @@
     <version>1.2.1-SNAPSHOT</version>
 
     <build>
-        <finalName>aem-dialog-plugin-sandbox-content-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/content/jcr_root</directory>
+                <excludes>
+                    <exclude>**/*.vlt/**</exclude>
+                    <exclude>**/*.vlt</exclude>
+                    <exclude>**/*.DS_Store</exclude>
+                </excludes>
+                <targetPath>.</targetPath>
+            </resource>
+            <resource>
+                <directory>src/main/content/META-INF</directory>
+                <excludes>
+                    <exclude>**/*.vlt/**</exclude>
+                    <exclude>**/*.vlt</exclude>
+                    <exclude>**/*.DS_Store</exclude>
+                </excludes>
+                <targetPath>../vault-work/META-INF</targetPath>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.day.jcr.vault</groupId>
+                <artifactId>content-package-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -27,30 +57,18 @@
         <profile>
             <id>install-samples</id>
             <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/content/jcr_root</directory>
-                        <excludes>
-                            <exclude>**/*.vlt/**</exclude>
-                            <exclude>**/*.vlt</exclude>
-                            <exclude>**/*.DS_Store</exclude>
-                        </excludes>
-                        <targetPath>.</targetPath>
-                    </resource>
-                    <resource>
-                        <directory>src/main/content/META-INF</directory>
-                        <excludes>
-                            <exclude>**/*.vlt/**</exclude>
-                            <exclude>**/*.vlt</exclude>
-                            <exclude>**/*.DS_Store</exclude>
-                        </excludes>
-                        <targetPath>../vault-work/META-INF</targetPath>
-                    </resource>
-                </resources>
                 <plugins>
                     <plugin>
                         <groupId>com.day.jcr.vault</groupId>
                         <artifactId>content-package-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>Installing AEM package</id>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/samples/core/pom.xml b/samples/core/pom.xml
index 2ace2fea8..878cc49be 100644
--- a/samples/core/pom.xml
+++ b/samples/core/pom.xml
@@ -21,20 +21,17 @@
     <packaging>bundle</packaging>
 
     <build>
-        <finalName>${project.parent.artifactId}-core-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Sling-Model-Packages>com.exadel.aem.toolkit.samples.models</Sling-Model-Packages>
-                        <Export-Package>com.exadel.aem.toolkit.samples.*</Export-Package>
-                        <!-- Import any version of javax.inject, to allow running on multiple versions of AEM -->
-                        <Import-Package>*;resolution:=optional</Import-Package>
-                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -57,7 +54,7 @@
 
         <!-- Internal -->
         <dependency>
-            <groupId>com.exadel.aem</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>aem-authoring-toolkit-api</artifactId>
         </dependency>
     </dependencies>
diff --git a/samples/pom.xml b/samples/pom.xml
index 58ef3b1ff..9afcb384e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -4,12 +4,22 @@
          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>
 
-    <parent>
-        <artifactId>aem-authoring-toolkit</artifactId>
-        <groupId>com.exadel.aem</groupId>
-        <version>1.2.1-SNAPSHOT</version>
-    </parent>
+    <artifactId>aem-authoring-toolkit-samples</artifactId>
+    <groupId>com.exadel.aem</groupId>
+    <name>AEM Authoring Toolkit - Samples</name>
+    <version>1.2.1-SNAPSHOT</version>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>core</module>
+        <module>apps</module>
+        <module>content</module>
+    </modules>
+
     <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <host>localhost</host>
         <port>4502</port>
         <serviceUrl>http://${host}:${port}/crx/packmgr/service.jsp</serviceUrl>
@@ -17,12 +27,6 @@
         <aat.version>1.2.1-SNAPSHOT</aat.version>
     </properties>
 
-    <artifactId>aem-authoring-toolkit-samples</artifactId>
-    <name>AEM Authoring Toolkit - Samples</name>
-    <version>1.2.1-SNAPSHOT</version>
-
-    <packaging>pom</packaging>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -31,16 +35,22 @@
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>4.2.1</version>
                     <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Sling-Model-Packages>com.exadel.aem.toolkit.samples.models</Sling-Model-Packages>
+                            <Export-Package>com.exadel.aem.toolkit.samples.*</Export-Package>
+                            <Import-Package>*;resolution:=optional</Import-Package>
+                            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+                        </instructions>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
                     <version>2.5.2</version>
-                    <executions>
-                        <execution>
-                            <id>default-install</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.day.jcr.vault</groupId>
@@ -54,10 +64,9 @@
                     </configuration>
                     <executions>
                         <execution>
-                            <id>Compile and install local application package</id>
+                            <id>Creating AEM package</id>
                             <goals>
                                 <goal>package</goal>
-                                <goal>install</goal>
                             </goals>
                         </execution>
                     </executions>
@@ -81,7 +90,6 @@
         </pluginManagement>
     </build>
 
-
     <dependencyManagement>
         <dependencies>
             <!-- Foreign -->
@@ -111,7 +119,7 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- Internal -->
+            <!-- AAT-Specific -->
             <dependency>
                 <groupId>com.exadel.aem</groupId>
                 <artifactId>aem-authoring-toolkit-api</artifactId>
@@ -121,9 +129,10 @@
                 <groupId>com.exadel.aem</groupId>
                 <artifactId>aem-authoring-toolkit-assets</artifactId>
                 <version>${aat.version}</version>
-                <type>content-package</type>
+                <type>zip</type>
             </dependency>
 
+            <!-- Internal -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aem-authoring-toolkit-samples-core</artifactId>
@@ -133,11 +142,14 @@
     </dependencyManagement>
 
     <repositories>
-        <!-- For AEM Authoring Toolkit snapshot version -->
         <repository>
             <id>aem-authoring-toolkit-snapshots</id>
             <name>Toolkit Snapshot</name>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
         <repository>
             <id>adobe</id>
@@ -146,8 +158,8 @@
             <layout>default</layout>
         </repository>
     </repositories>
+
     <pluginRepositories>
-        <!-- For AEM Authoring Toolkit snapshot version -->
         <pluginRepository>
             <id>aem-authoring-toolkit-snapshots</id>
             <name>Toolkit Snapshot</name>
@@ -164,10 +176,4 @@
             <layout>default</layout>
         </pluginRepository>
     </pluginRepositories>
-
-    <modules>
-        <module>core</module>
-        <module>apps</module>
-        <module>content</module>
-    </modules>
 </project>