diff --git a/devicetypes/moisture/moisture.src/moisture.groovy b/devicetypes/moisture/moisture.src/moisture.groovy
new file mode 100644
index 0000000..48fba9d
--- /dev/null
+++ b/devicetypes/moisture/moisture.src/moisture.groovy
@@ -0,0 +1,36 @@
+/**
+ *  Moisture
+ *
+ *  Copyright 2014 Shobhit Bhatt
+ *
+ *  Licensed under the Apache License, Version 2.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.
+ *
+ */
+metadata {
+	definition (name: "Moisture", namespace: "Moisture", author: "Shobhit Bhatt") {
+		capability "Temperature Measurement"
+	}
+
+	simulator {
+		// TODO: define status and reply messages here
+	}
+
+	tiles {
+		// TODO: define your main and details tiles here
+	}
+}
+
+// parse events into attributes
+def parse(String description) {
+	log.debug "Parsing '${description}'"
+	// TODO: handle 'temperature' attribute
+
+}
+
diff --git a/smartapps/gitnikhil/moisture-test.src/moisture-test.groovy b/smartapps/gitnikhil/moisture-test.src/moisture-test.groovy
new file mode 100644
index 0000000..83ed75e
--- /dev/null
+++ b/smartapps/gitnikhil/moisture-test.src/moisture-test.groovy
@@ -0,0 +1,49 @@
+/**
+ *  Moisture Test
+ *
+ *  Copyright 2014 Shobhit Bhatt
+ *
+ *  Licensed under the Apache License, Version 2.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.
+ *
+ */
+definition(
+    name: "Moisture Test",
+    namespace: "GitNikhil",
+    author: "Shobhit Bhatt",
+    description: "SMTP",
+    category: "Safety & Security",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+
+preferences {
+	section("Title") {
+		// TODO: put inputs here
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {
+	// TODO: subscribe to attributes, devices, locations, etc.
+}
+
+// TODO: implement event handlers
\ No newline at end of file
diff --git a/smartapps/moisture-server-room/moisture.src/moisture.groovy b/smartapps/moisture-server-room/moisture.src/moisture.groovy
new file mode 100644
index 0000000..0d6c374
--- /dev/null
+++ b/smartapps/moisture-server-room/moisture.src/moisture.groovy
@@ -0,0 +1,53 @@
+/**
+ *  Moisture
+ *
+ *  Copyright 2014 Shobhit Bhatt
+ *
+ *  Licensed under the Apache License, Version 2.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.
+ *
+ */
+definition(
+    name: "Moisture",
+    namespace: "Moisture Server Room",
+    author: "Shobhit Bhatt",
+    description: "Will Receive Moisture details",
+    category: "Safety & Security",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    oauth: true) {
+    appSetting "Moisture"
+    appSetting "Moisture"
+}
+
+
+preferences {
+	section("Title") {
+		// TODO: put inputs here
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {
+	// TODO: subscribe to attributes, devices, locations, etc.
+}
+
+// TODO: implement event handlers
\ No newline at end of file