diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 5c98b4288..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/.idea/azure.iml b/.idea/azure.iml
deleted file mode 100644
index 5ec00fe76..000000000
--- a/.idea/azure.iml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.7 (1)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da2..000000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5136e9e1a..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (1)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 716adf06b..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/azure.iml" filepath="$PROJECT_DIR$/.idea/azure.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5b4761da..3e31152ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Change Log
 
+## v0.2.0 (2020-07-03)
+
+### NEW MODULES
+  - azure_rm_privatezone module ([#122](https://github.com/ansible-collections/azure/pull/122))
+  - azure_rm_adserviceprincipal module ([#179](https://github.com/ansible-collections/azure/pull/179))
+  - azure_rm_adserviceprincipal_info module ([#179](https://github.com/ansible-collections/azure/pull/179))
+  - azure_rm_adpassword module ([#179](https://github.com/ansible-collections/azure/pull/179))
+  - azure_rm_adpassword_info module ([#179](https://github.com/ansible-collections/azure/pull/179))
+
+### FEATURE ENHANCEMENT
+  - add ability to remove all subnet service endpoints ([#148](https://github.com/ansible-collections/azure/pull/148))
+  - update network client api version ([#157](https://github.com/ansible-collections/azure/pull/157))
+  - add ephemeral os disk support for azure_rm_virualmachinescaleset ([#128](https://github.com/ansible-collections/azure/pull/128))
+  - add ephemeral os disk support for azure_rm_virtualmachine ([#124](https://github.com/ansible-collections/azure/pull/124))
+  - add FileEndpoint to azure_rm_storageaccount_info ([#102](https://github.com/ansible-collections/azure/pull/102))
+  - add support for managing the 'Firewall and virtual networks' settings in azure_rm_storageaccount ([#108](https://github.com/ansible-collections/azure/pull/108))
+
+### BUG FIXING
+  - bug fixing in azure_rm_aks ([#170](https://github.com/ansible-collections/azure/pull/170))
+  - migrate missing doc_fragments that went missing ([#115](https://github.com/ansible-collections/azure/pull/115))
+
 ## v0.1.3 (2020-05-13)
 
 - add new parameter in azure_rm_aks
diff --git a/galaxy.yml b/galaxy.yml
index 02bad7c4c..281dfb65f 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: azure
 name: azcollection
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 0.1.3
+version: 0.2.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -18,7 +18,6 @@ readme: README.md
 # @nicks:irc/im.site#channel'
 authors:
 - Microsoft <haiyzhan@microsoft.com>
-- Microsoft <jieshe@microsoft.com>
 
 
 ### OPTIONAL but strongly recommended
diff --git a/log_plugin.log b/log_plugin.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/modules/azure_rm_adpassword.py b/plugins/modules/azure_rm_adpassword.py
index a0ee0db10..9b48a32cc 100644
--- a/plugins/modules/azure_rm_adpassword.py
+++ b/plugins/modules/azure_rm_adpassword.py
@@ -30,9 +30,9 @@
         description:
             - The application ID.
         type: str
-    service_principal_id:
+    service_principal_object_id:
         description:
-            - The service principal ID.
+            - The service principal object ID.
         type: str
     key_id:
         description:
@@ -129,7 +129,7 @@ def __init__(self):
 
         self.module_arg_spec = dict(
             app_id=dict(type='str'),
-            service_principal_id=dict(type='str'),
+            service_principal_object_id=dict(type='str'),
             app_object_id=dict(type='str'),
             key_id=dict(type='str'),
             tenant=dict(type='str', required=True),
@@ -141,7 +141,7 @@ def __init__(self):
         self.state = None
         self.tenant = None
         self.app_id = None
-        self.service_principal_id = None
+        self.service_principal_object_id = None
         self.app_object_id = None
         self.key_id = None
         self.value = None
@@ -188,12 +188,12 @@ def resolve_app_obj_id(self):
                 return
             elif self.app_id or self.service_principal_object_id:
                 if not self.app_id:
-                    sp = self.client.service_principals.get(self.service_principal_id)
+                    sp = self.client.service_principals.get(self.service_principal_object_id)
                     self.app_id = sp.app_id
                 if not self.app_id:
                     self.fail("can't resolve app via service principal object id {0}".format(self.service_principal_object_id))
 
-                result = list(self.client.applications.list(filter="appId eq {0}".format(self.app_id)))
+                result = list(self.client.applications.list(filter="appId eq '{}'".format(self.app_id)))
                 if result:
                     self.app_object_id = result[0].object_id
                 else:
diff --git a/plugins/modules/azure_rm_adpassword_info.py b/plugins/modules/azure_rm_adpassword_info.py
index 0520e9864..e29d53aa1 100644
--- a/plugins/modules/azure_rm_adpassword_info.py
+++ b/plugins/modules/azure_rm_adpassword_info.py
@@ -179,7 +179,7 @@ def resolve_app_obj_id(self):
                 if not self.app_id:
                     self.fail("can't resolve app via service principal object id {0}".format(self.service_principal_object_id))
 
-                result = list(self.client.applications.list(filter="appId eq {0}".format(self.app_id)))
+                result = list(self.client.applications.list(filter="appId eq '{}'".format(self.app_id)))
                 if result:
                     self.app_object_id = result[0].object_id
                 else:
diff --git a/src/ansible_collections/azure/azcollection/plugins b/src/ansible_collections/azure/azcollection/plugins
deleted file mode 120000
index 2cdf59af9..000000000
--- a/src/ansible_collections/azure/azcollection/plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../plugins
\ No newline at end of file
diff --git a/tests/integration/targets/azure_rm_adpassword/tasks/main.yml b/tests/integration/targets/azure_rm_adpassword/tasks/main.yml
index ba7946377..834c55763 100644
--- a/tests/integration/targets/azure_rm_adpassword/tasks/main.yml
+++ b/tests/integration/targets/azure_rm_adpassword/tasks/main.yml
@@ -41,7 +41,7 @@
   ignore_errors: True
 
 - name: Get ad password info
-  azure_rm_adpasswordinfo:
+  azure_rm_adpassword_info:
     app_id: "{{ app_id }}"
     tenant: "{{ tenant_id }}"
     key_id: "{{ ad_fact.key_id }}"