From 863cd7658d6c29c96bbdf77e37227b060ed67ca0 Mon Sep 17 00:00:00 2001
From: Tim Bart <tim@sayhello.com>
Date: Fri, 26 Aug 2016 14:46:54 -0700
Subject: [PATCH] Merging master

---
 .../insights => insights/models}/SleepDeprivation.java     | 7 ++++---
 .../models/Insights/Message/SleepDeprivationMsgEN.java     | 2 ++
 .../models}/SleepDeprivationInsightsTest.java              | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename suripu-core/src/main/java/com/hello/suripu/core/{processors/insights => insights/models}/SleepDeprivation.java (97%)
 rename suripu-core/src/test/java/com/hello/suripu/core/{processors/insights => insights/models}/SleepDeprivationInsightsTest.java (98%)

diff --git a/suripu-core/src/main/java/com/hello/suripu/core/processors/insights/SleepDeprivation.java b/suripu-core/src/main/java/com/hello/suripu/core/insights/models/SleepDeprivation.java
similarity index 97%
rename from suripu-core/src/main/java/com/hello/suripu/core/processors/insights/SleepDeprivation.java
rename to suripu-core/src/main/java/com/hello/suripu/core/insights/models/SleepDeprivation.java
index 1db801033..0f903756c 100644
--- a/suripu-core/src/main/java/com/hello/suripu/core/processors/insights/SleepDeprivation.java
+++ b/suripu-core/src/main/java/com/hello/suripu/core/insights/models/SleepDeprivation.java
@@ -1,12 +1,13 @@
-package com.hello.suripu.core.processors.insights;
+package com.hello.suripu.core.insights.models;
+
 import com.google.common.base.Optional;
 import com.hello.suripu.core.db.AccountReadDAO;
 import com.hello.suripu.core.db.SleepStatsDAODynamoDB;
+import com.hello.suripu.core.insights.InsightCard;
+import com.hello.suripu.core.insights.models.text.Text;
 import com.hello.suripu.core.models.Account;
 import com.hello.suripu.core.models.AggregateSleepStats;
-import com.hello.suripu.core.models.Insights.InsightCard;
 import com.hello.suripu.core.models.Insights.Message.SleepDeprivationMsgEN;
-import com.hello.suripu.core.models.Insights.Message.Text;
 import com.hello.suripu.core.models.SleepDebtProfile;
 import com.hello.suripu.core.util.DateTimeUtil;
 import org.joda.time.DateTime;
diff --git a/suripu-core/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java b/suripu-core/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java
index 086205fdf..265ada3d2 100644
--- a/suripu-core/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java
+++ b/suripu-core/src/main/java/com/hello/suripu/core/models/Insights/Message/SleepDeprivationMsgEN.java
@@ -1,5 +1,7 @@
 package com.hello.suripu.core.models.Insights.Message;
 
+import com.hello.suripu.core.insights.models.text.Text;
+
 /**
  * Created by jarredheinrich on 7/8/16.
  */
diff --git a/suripu-core/src/test/java/com/hello/suripu/core/processors/insights/SleepDeprivationInsightsTest.java b/suripu-core/src/test/java/com/hello/suripu/core/insights/models/SleepDeprivationInsightsTest.java
similarity index 98%
rename from suripu-core/src/test/java/com/hello/suripu/core/processors/insights/SleepDeprivationInsightsTest.java
rename to suripu-core/src/test/java/com/hello/suripu/core/insights/models/SleepDeprivationInsightsTest.java
index c90d80e6a..65c84c504 100644
--- a/suripu-core/src/test/java/com/hello/suripu/core/processors/insights/SleepDeprivationInsightsTest.java
+++ b/suripu-core/src/test/java/com/hello/suripu/core/insights/models/SleepDeprivationInsightsTest.java
@@ -1,13 +1,13 @@
-package com.hello.suripu.core.processors.insights;
+package com.hello.suripu.core.insights.models;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.hello.suripu.core.db.AccountReadDAO;
 import com.hello.suripu.core.db.SleepStatsDAODynamoDB;
+import com.hello.suripu.core.insights.InsightCard;
 import com.hello.suripu.core.models.Account;
 import com.hello.suripu.core.models.AggregateSleepStats;
-import com.hello.suripu.core.models.Insights.InsightCard;
 import com.hello.suripu.core.models.Insights.Message.SleepDeprivationMsgEN;
 import com.hello.suripu.core.models.MotionScore;
 import com.hello.suripu.core.models.SleepStats;