diff --git a/src/main/java/se/koc/trader/signal/Analytics.java b/src/main/java/se/koc/trader/api/Signal.java
similarity index 55%
rename from src/main/java/se/koc/trader/signal/Analytics.java
rename to src/main/java/se/koc/trader/api/Signal.java
index e7f7e10..e75ffaa 100644
--- a/src/main/java/se/koc/trader/signal/Analytics.java
+++ b/src/main/java/se/koc/trader/api/Signal.java
@@ -1,9 +1,9 @@
-package se.koc.trader.signal;
+package se.koc.trader.api;
 
 /**
  * Generic interface representing historical analytics.
  */
-public class Analytics {
+public interface Signal {
 
 
 }
diff --git a/src/main/java/se/koc/trader/signal/MovingAverage.java b/src/main/java/se/koc/trader/signal/MovingAverage.java
index 153289a..9bfae2f 100644
--- a/src/main/java/se/koc/trader/signal/MovingAverage.java
+++ b/src/main/java/se/koc/trader/signal/MovingAverage.java
@@ -1,4 +1,6 @@
 package se.koc.trader.signal;
 
-public class MovingAverage {
+import se.koc.trader.api.Signal;
+
+public class MovingAverage implements Signal {
 }
diff --git a/src/main/java/se/koc/trader/signal/SmoothedMovingAverage.java b/src/main/java/se/koc/trader/signal/SmoothedMovingAverage.java
new file mode 100644
index 0000000..f145ad7
--- /dev/null
+++ b/src/main/java/se/koc/trader/signal/SmoothedMovingAverage.java
@@ -0,0 +1,6 @@
+package se.koc.trader.signal;
+
+import se.koc.trader.api.Signal;
+
+public class SmoothedMovingAverage implements Signal {
+}
diff --git a/src/main/java/se/koc/trader/signal/SmothedMovingAverage.java b/src/main/java/se/koc/trader/signal/SmothedMovingAverage.java
deleted file mode 100644
index c6a8e39..0000000
--- a/src/main/java/se/koc/trader/signal/SmothedMovingAverage.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package se.koc.trader.signal;
-
-public class SmothedMovingAverage {
-}
diff --git a/src/main/java/se/koc/trader/signal/WeightedMovingAverage.java b/src/main/java/se/koc/trader/signal/WeightedMovingAverage.java
index 65b1760..63c9231 100644
--- a/src/main/java/se/koc/trader/signal/WeightedMovingAverage.java
+++ b/src/main/java/se/koc/trader/signal/WeightedMovingAverage.java
@@ -1,4 +1,6 @@
 package se.koc.trader.signal;
 
-public class WeightedMovingAverage {
+import se.koc.trader.api.Signal;
+
+public class WeightedMovingAverage implements Signal {
 }