diff --git a/srsepc/hdr/mme/mme.h b/srsepc/hdr/mme/mme.h
index 14f7c686c..b7a74a940 100644
--- a/srsepc/hdr/mme/mme.h
+++ b/srsepc/hdr/mme/mme.h
@@ -24,7 +24,11 @@
  *
  */
 
-#include "srslte/common/log.h"
+/******************************************************************************
+ * File:        mme.h
+ * Description: Top-level MME class. Creates and links all
+ *              interfaces and helpers.
+ *****************************************************************************/
 
 #ifndef MME_H
 #define MME_H
@@ -33,8 +37,14 @@ namespace srsepc{
 
 class mme
 {
+private:
+
+  static mme *instance;
+  mme();
+  virtual ~mme();
 
 };
 
 } // namespace srsepc
+
 #endif // MME_H
diff --git a/srsepc/src/CMakeLists.txt b/srsepc/src/CMakeLists.txt
index 28f94aa98..47d125a32 100644
--- a/srsepc/src/CMakeLists.txt
+++ b/srsepc/src/CMakeLists.txt
@@ -13,10 +13,7 @@ endif (RPATH)
 
 
 add_executable(srsepc main.cc )
-target_link_libraries(srsepc  srsenb_upper
-                              srslte_common
-                              srslte_phy
-                              srslte_upper
+target_link_libraries(srsepc  srsepc_mme
                               ${CMAKE_THREAD_LIBS_INIT} 
                               ${Boost_LIBRARIES} 
                               ${SEC_LIBRARIES}
@@ -32,11 +29,11 @@ install(TARGETS srsepc DESTINATION ${RUNTIME_DIR})
 ########################################################################
 # Option to run command after build (useful for remote builds)
 ########################################################################
-if (NOT ${BUILDENB_CMD} STREQUAL "")
-  message(STATUS "Added custom post-build-ENB command: ${BUILDENB_CMD}")
+if (NOT ${BUILDEPC_CMD} STREQUAL "")
+  message(STATUS "Added custom post-build-EPC command: ${BUILDENB_CMD}")
   add_custom_command(TARGET srsenb POST_BUILD COMMAND ${BUILDENB_CMD})
-else(NOT ${BUILDENB_CMD} STREQUAL "")
-  message(STATUS "No post-build-ENB command defined")
-endif (NOT ${BUILDENB_CMD} STREQUAL "")
+else(NOT ${BUILDEPC_CMD} STREQUAL "")
+  message(STATUS "No post-build-EPC command defined")
+endif (NOT ${BUILDEPC_CMD} STREQUAL "")
 
 install(TARGETS srsepc DESTINATION ${RUNTIME_DIR})
diff --git a/srsepc/src/main.cc b/srsepc/src/main.cc
index 89b0aca3c..954c7cb63 100644
--- a/srsepc/src/main.cc
+++ b/srsepc/src/main.cc
@@ -1,4 +1,4 @@
-#include "mme.h"
+#include "mme/mme.h"
 
 int
 main (int argc,char * argv[] )
diff --git a/srsepc/src/mme/mme.cc b/srsepc/src/mme/mme.cc
index 44a81569f..6b6cdb953 100644
--- a/srsepc/src/mme/mme.cc
+++ b/srsepc/src/mme/mme.cc
@@ -25,9 +25,12 @@
  */
 
 
-#include "mme.h"
+#include "mme/mme.h"
 
-class srsmme
+namespace srsepc{
+
+mme::mme()
 {
-  int tst;
-};
+}
+
+} //namespace srsepc