diff --git a/.gitignore b/ImplicitIntentsReceiver/.gitignore
similarity index 100%
rename from .gitignore
rename to ImplicitIntentsReceiver/.gitignore
diff --git a/.idea/compiler.xml b/ImplicitIntentsReceiver/.idea/compiler.xml
similarity index 100%
rename from .idea/compiler.xml
rename to ImplicitIntentsReceiver/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/ImplicitIntentsReceiver/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from .idea/copyright/profiles_settings.xml
rename to ImplicitIntentsReceiver/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/ImplicitIntentsReceiver/.idea/gradle.xml
similarity index 100%
rename from .idea/gradle.xml
rename to ImplicitIntentsReceiver/.idea/gradle.xml
diff --git a/.idea/misc.xml b/ImplicitIntentsReceiver/.idea/misc.xml
similarity index 100%
rename from .idea/misc.xml
rename to ImplicitIntentsReceiver/.idea/misc.xml
diff --git a/.idea/modules.xml b/ImplicitIntentsReceiver/.idea/modules.xml
similarity index 66%
rename from .idea/modules.xml
rename to ImplicitIntentsReceiver/.idea/modules.xml
index e73a3c1fe1b62922deed710cac929e6e177de7c1..cae774ec89b26d972bf624c206835140f39b9ff3 100644
--- a/.idea/modules.xml
+++ b/ImplicitIntentsReceiver/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ImplsitIntents.iml" filepath="$PROJECT_DIR$/ImplsitIntents.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ImplicitIntentsReceiver.iml" filepath="$PROJECT_DIR$/ImplicitIntentsReceiver.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/.idea/runConfigurations.xml b/ImplicitIntentsReceiver/.idea/runConfigurations.xml
similarity index 100%
rename from .idea/runConfigurations.xml
rename to ImplicitIntentsReceiver/.idea/runConfigurations.xml
diff --git a/app/.gitignore b/ImplicitIntentsReceiver/app/.gitignore
similarity index 100%
rename from app/.gitignore
rename to ImplicitIntentsReceiver/app/.gitignore
diff --git a/app/build.gradle b/ImplicitIntentsReceiver/app/build.gradle
similarity index 93%
rename from app/build.gradle
rename to ImplicitIntentsReceiver/app/build.gradle
index 47af382bf7326fb25e00bf50feebf4850a693bb3..3786f1d34e390be7a2e425e8997b7c5f23241806 100644
--- a/app/build.gradle
+++ b/ImplicitIntentsReceiver/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.3"
     defaultConfig {
-        applicationId "com.example.asus.implsitintents"
+        applicationId "com.example.asus.implicitintentsreceiver"
         minSdkVersion 22
         targetSdkVersion 25
         versionCode 1
diff --git a/app/proguard-rules.pro b/ImplicitIntentsReceiver/app/proguard-rules.pro
similarity index 100%
rename from app/proguard-rules.pro
rename to ImplicitIntentsReceiver/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/example/asus/implsitintents/ExampleInstrumentedTest.java b/ImplicitIntentsReceiver/app/src/androidTest/java/com/example/asus/implicitintentsreceiver/ExampleInstrumentedTest.java
similarity index 81%
rename from app/src/androidTest/java/com/example/asus/implsitintents/ExampleInstrumentedTest.java
rename to ImplicitIntentsReceiver/app/src/androidTest/java/com/example/asus/implicitintentsreceiver/ExampleInstrumentedTest.java
index a200e82badc0926143abc3b8c887d86820b676c8..01fbfde9631f612ee31e0c93d6ad54361c5f1196 100644
--- a/app/src/androidTest/java/com/example/asus/implsitintents/ExampleInstrumentedTest.java
+++ b/ImplicitIntentsReceiver/app/src/androidTest/java/com/example/asus/implicitintentsreceiver/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.asus.implsitintents;
+package com.example.asus.implicitintentsreceiver;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.example.asus.implsitintents", appContext.getPackageName());
+        assertEquals("com.example.asus.implicitintentsreceiver", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/ImplicitIntentsReceiver/app/src/main/AndroidManifest.xml
similarity index 60%
rename from app/src/main/AndroidManifest.xml
rename to ImplicitIntentsReceiver/app/src/main/AndroidManifest.xml
index fd949d92ce4e7fa324172396643f592fd0b3ced4..60d09c36834b384140598418e4aef866505020b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/ImplicitIntentsReceiver/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.asus.implsitintents">
+    package="com.example.asus.implicitintentsreceiver">
 
     <application
         android:allowBackup="true"
@@ -15,6 +15,13 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http"
+                    android:host="developer.android.com" />
+            </intent-filter>
         </activity>
     </application>
 
diff --git a/ImplicitIntentsReceiver/app/src/main/java/com/example/asus/implicitintentsreceiver/MainActivity.java b/ImplicitIntentsReceiver/app/src/main/java/com/example/asus/implicitintentsreceiver/MainActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..a47f3640f3370ee11ed4328a9f0e433f6202d607
--- /dev/null
+++ b/ImplicitIntentsReceiver/app/src/main/java/com/example/asus/implicitintentsreceiver/MainActivity.java
@@ -0,0 +1,23 @@
+package com.example.asus.implicitintentsreceiver;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
+        if (uri != null) {
+            String uri_string = "URI: " + uri.toString();
+            TextView textView = (TextView) findViewById(R.id.text_uri_message);
+            textView.setText(uri_string);
+        }
+    }
+}
diff --git a/ImplicitIntentsReceiver/app/src/main/res/layout/activity_main.xml b/ImplicitIntentsReceiver/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eaac336861bf6e8fc8639bf74ee7a10d07e8a9fc
--- /dev/null
+++ b/ImplicitIntentsReceiver/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.asus.implicitintentsreceiver.MainActivity">
+
+    <TextView
+        android:id="@+id/text_uri_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:textStyle="bold"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/ImplicitIntentsReceiver/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to ImplicitIntentsReceiver/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/colors.xml b/ImplicitIntentsReceiver/app/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to ImplicitIntentsReceiver/app/src/main/res/values/colors.xml
diff --git a/ImplicitIntentsReceiver/app/src/main/res/values/strings.xml b/ImplicitIntentsReceiver/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2159a289da413caa0cf4a737fd7372496d7619a6
--- /dev/null
+++ b/ImplicitIntentsReceiver/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Implicit Intents Receiver</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/ImplicitIntentsReceiver/app/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to ImplicitIntentsReceiver/app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/com/example/asus/implsitintents/ExampleUnitTest.java b/ImplicitIntentsReceiver/app/src/test/java/com/example/asus/implicitintentsreceiver/ExampleUnitTest.java
similarity index 88%
rename from app/src/test/java/com/example/asus/implsitintents/ExampleUnitTest.java
rename to ImplicitIntentsReceiver/app/src/test/java/com/example/asus/implicitintentsreceiver/ExampleUnitTest.java
index 590533579405aaea5ae3d7f2ab6e5587ca9693dc..7af2b350179530061e355d226b3c77eebd903cca 100644
--- a/app/src/test/java/com/example/asus/implsitintents/ExampleUnitTest.java
+++ b/ImplicitIntentsReceiver/app/src/test/java/com/example/asus/implicitintentsreceiver/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.example.asus.implsitintents;
+package com.example.asus.implicitintentsreceiver;
 
 import org.junit.Test;
 
diff --git a/build.gradle b/ImplicitIntentsReceiver/build.gradle
similarity index 88%
rename from build.gradle
rename to ImplicitIntentsReceiver/build.gradle
index b78a0b86c939620b6f05483ce45c4d3ef0ef595e..c2eea8e27fd12cc1e274a0940f06f350e855e20f 100644
--- a/build.gradle
+++ b/ImplicitIntentsReceiver/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/ImplicitIntentsReceiver/gradle.properties
similarity index 100%
rename from gradle.properties
rename to ImplicitIntentsReceiver/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/ImplicitIntentsReceiver/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to ImplicitIntentsReceiver/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/ImplicitIntentsReceiver/gradle/wrapper/gradle-wrapper.properties
similarity index 86%
rename from gradle/wrapper/gradle-wrapper.properties
rename to ImplicitIntentsReceiver/gradle/wrapper/gradle-wrapper.properties
index ebc5198aeb1db1bbed6acdb0d00e2d167c5c9d01..d22d002d26c4573c6a838372ebe040f1cd44ba93 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/ImplicitIntentsReceiver/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Sep 03 05:46:21 ICT 2017
+#Sun Sep 03 09:44:32 ICT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/ImplicitIntentsReceiver/gradlew
similarity index 100%
rename from gradlew
rename to ImplicitIntentsReceiver/gradlew
diff --git a/gradlew.bat b/ImplicitIntentsReceiver/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to ImplicitIntentsReceiver/gradlew.bat
diff --git a/settings.gradle b/ImplicitIntentsReceiver/settings.gradle
similarity index 100%
rename from settings.gradle
rename to ImplicitIntentsReceiver/settings.gradle
diff --git a/ImplsitIntents b/ImplsitIntents
new file mode 160000
index 0000000000000000000000000000000000000000..402caf0ef684df9994d5a43f2858c7ce7e360f99
--- /dev/null
+++ b/ImplsitIntents
@@ -0,0 +1 @@
+Subproject commit 402caf0ef684df9994d5a43f2858c7ce7e360f99
diff --git a/app/src/main/java/com/example/asus/implsitintents/MainActivity.java b/app/src/main/java/com/example/asus/implsitintents/MainActivity.java
deleted file mode 100644
index f2b2c2313128a3fd5d85f9d13f16c2da19fef621..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/asus/implsitintents/MainActivity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.example.asus.implsitintents;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.support.v4.app.ShareCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-
-public class MainActivity extends AppCompatActivity {
-
-    private EditText mWebsiteEditText;
-    private EditText mLocationEditText;
-    private EditText mShareTextEditText;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        mWebsiteEditText = (EditText) findViewById(R.id.website_edittext);
-
-    }
-    public void openWebsite(View view) {
-        // Get the URL text.
-        String url = mWebsiteEditText.getText().toString();
-
-        // Parse the URI and create the intent.
-        Uri webpage = Uri.parse(url);
-        Intent intent = new Intent(Intent.ACTION_VIEW, webpage);
-
-        // Find an activity to hand the intent and start that activity.
-        if (intent.resolveActivity(getPackageManager()) != null) {
-            startActivity(intent);
-        } else {
-            Log.d("ImplicitIntents", "Can't handle this intent!");
-        }
-    }
-
-    public void openLocation(View view) {
-        // Get the string indicating a location. Input is not validated; it is
-        // passed to the location handler intact.
-        String loc = mLocationEditText.getText().toString();
-
-        // Parse the location and create the intent.
-        Uri addressUri = Uri.parse("geo:0,0?q=" + loc);
-        Intent intent = new Intent(Intent.ACTION_VIEW, addressUri);
-
-        // Find an activity to handle the intent, and start that activity.
-        if (intent.resolveActivity(getPackageManager()) != null) {
-            startActivity(intent);
-        } else {
-            Log.d("ImplicitIntents", "Can't handle this intent!");
-        }
-    }
-
-    public void shareText(View view) {
-        String txt = mShareTextEditText.getText().toString();
-        String mimeType = "text/plain";
-
-        ShareCompat.IntentBuilder
-                .from(this)
-                .setType(mimeType)
-                .setChooserTitle("Share this text with: ")
-                .setText(txt)
-                .startChooser();
-    }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 5043516b0da0c13175a5d9bd077cd3bdb9616c6e..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.asus.implsitintents.MainActivity">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        tools:context="com.example.android.implicitintents.MainActivity"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/website_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/edittext_uri" />
-
-        <Button
-            android:id="@+id/open_website_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:onClick="openWebsite"
-            android:text="@string/button_uri" />
-
-        <EditText
-            android:id="@+id/location_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/edittext_loc" />
-
-        <Button
-            android:id="@+id/open_location_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:onClick="openLocation"
-            android:text="@string/button_loc" />
-
-        <EditText
-            android:id="@+id/share_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/edittext_share" />
-
-        <Button
-            android:id="@+id/share_text_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:onClick="shareText"
-            android:text="@string/button_share" />
-    </LinearLayout>
-</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 6196eff9a9e0f27780d91389c8f83327321bd96f..0000000000000000000000000000000000000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="activity_vertical_margin">20dp</dimen>
-    <dimen name="activity_horizontal_margin">20dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index c737f2a7678e82d1cb9617aa278f9bb11e514b84..0000000000000000000000000000000000000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-    <string name="app_name">Implsit Intents</string>
-    <string name="edittext_uri">http://developer.android.com</string>
-    <string name="button_uri">Open Website</string>
-
-    <string name="edittext_loc">Golden Gate Bridge</string>
-    <string name="button_loc">Open Location</string>
-
-    <string name="edittext_share">\'Twas brillig and the slithy toves</string>
-    <string name="button_share">Share This Text</string>
-</resources>