diff --git a/.gitignore b/.gitignore
index 7b4979ae3b9..e4d132bcfd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ __pycache__
 # Ignore .c files by default to avoid including generated code. If you want to
 # add a non-generated .c extension, use `git add -f filename.c`.
 *.c
+!tardis/montecarlo/src/*.c
 
 # Other generated files
 */version.py
diff --git a/tardis/model.py b/tardis/model.py
index 753d21cc0a7..fdd7665dd5c 100644
--- a/tardis/model.py
+++ b/tardis/model.py
@@ -10,7 +10,7 @@
 import scipy.special
 
 from tardis import packet_source, plasma_array
-import montecarlo
+from tardis.montecarlo import montecarlo
 from util import intensity_black_body
 
 
diff --git a/tardis/montecarlo/__init__.py b/tardis/montecarlo/__init__.py
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tardis/montecarlo/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tardis/montecarlo.pyx b/tardis/montecarlo/montecarlo.pyx
similarity index 99%
rename from tardis/montecarlo.pyx
rename to tardis/montecarlo/montecarlo.pyx
index aea165e1266..8e8fbfe7362 100644
--- a/tardis/montecarlo.pyx
+++ b/tardis/montecarlo/montecarlo.pyx
@@ -15,7 +15,7 @@ np.import_array()
 
 ctypedef np.int64_t int_type_t
 
-cdef extern from "cmontecarlo.h":
+cdef extern from "src/cmontecarlo.h":
     ctypedef enum rpacket_status_t:
         TARDIS_PACKET_STATUS_IN_PROCESS = 0
         TARDIS_PACKET_STATUS_EMITTED = 1
diff --git a/tardis/montecarlo/setup_package.py b/tardis/montecarlo/setup_package.py
new file mode 100644
index 00000000000..f3b6dab0fc2
--- /dev/null
+++ b/tardis/montecarlo/setup_package.py
@@ -0,0 +1,19 @@
+#setting the right include
+from setuptools import Extension
+import numpy as np
+import os
+
+from glob import glob
+
+
+def get_extensions():
+    sources = ['tardis/montecarlo/montecarlo.pyx']
+    sources += [os.path.relpath(fname) for fname in glob(
+        os.path.join(os.path.dirname(__file__), 'src', '*.c'))]
+    sources += [os.path.relpath(fname) for fname in glob(
+        os.path.join(os.path.dirname(__file__), 'src/randomkit', '*.c'))]
+
+    return [Extension('tardis.montecarlo.montecarlo', sources,
+                      include_dirs=['tardis/montecarlo/src',
+                                    'tardis/montecarlo/src/randomkit',
+                                    np.get_include()])]
diff --git a/tardis/cmontecarlo.c b/tardis/montecarlo/src/cmontecarlo.c
similarity index 100%
rename from tardis/cmontecarlo.c
rename to tardis/montecarlo/src/cmontecarlo.c
diff --git a/tardis/cmontecarlo.h b/tardis/montecarlo/src/cmontecarlo.h
similarity index 99%
rename from tardis/cmontecarlo.h
rename to tardis/montecarlo/src/cmontecarlo.h
index 3d67e92bde5..bbcf2707d9a 100644
--- a/tardis/cmontecarlo.h
+++ b/tardis/montecarlo/src/cmontecarlo.h
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include "randomkit.h"
+#include "randomkit/randomkit.h"
 
 #ifdef __clang__
 #define INLINE extern inline
diff --git a/tardis/randomkit/LICENSE b/tardis/montecarlo/src/randomkit/LICENSE
similarity index 100%
rename from tardis/randomkit/LICENSE
rename to tardis/montecarlo/src/randomkit/LICENSE
diff --git a/tardis/randomkit/randomkit.h b/tardis/montecarlo/src/randomkit/randomkit.h
similarity index 100%
rename from tardis/randomkit/randomkit.h
rename to tardis/montecarlo/src/randomkit/randomkit.h
diff --git a/tardis/randomkit/rk_isaac.c b/tardis/montecarlo/src/randomkit/rk_isaac.c
similarity index 100%
rename from tardis/randomkit/rk_isaac.c
rename to tardis/montecarlo/src/randomkit/rk_isaac.c
diff --git a/tardis/randomkit/rk_isaac.h b/tardis/montecarlo/src/randomkit/rk_isaac.h
similarity index 100%
rename from tardis/randomkit/rk_isaac.h
rename to tardis/montecarlo/src/randomkit/rk_isaac.h
diff --git a/tardis/randomkit/rk_mt.c b/tardis/montecarlo/src/randomkit/rk_mt.c
similarity index 100%
rename from tardis/randomkit/rk_mt.c
rename to tardis/montecarlo/src/randomkit/rk_mt.c
diff --git a/tardis/randomkit/rk_mt.h b/tardis/montecarlo/src/randomkit/rk_mt.h
similarity index 100%
rename from tardis/randomkit/rk_mt.h
rename to tardis/montecarlo/src/randomkit/rk_mt.h
diff --git a/tardis/randomkit/rk_primitive.c b/tardis/montecarlo/src/randomkit/rk_primitive.c
similarity index 100%
rename from tardis/randomkit/rk_primitive.c
rename to tardis/montecarlo/src/randomkit/rk_primitive.c
diff --git a/tardis/randomkit/rk_primitive.h b/tardis/montecarlo/src/randomkit/rk_primitive.h
similarity index 100%
rename from tardis/randomkit/rk_primitive.h
rename to tardis/montecarlo/src/randomkit/rk_primitive.h
diff --git a/tardis/randomkit/rk_sobol.c b/tardis/montecarlo/src/randomkit/rk_sobol.c
similarity index 100%
rename from tardis/randomkit/rk_sobol.c
rename to tardis/montecarlo/src/randomkit/rk_sobol.c
diff --git a/tardis/randomkit/rk_sobol.h b/tardis/montecarlo/src/randomkit/rk_sobol.h
similarity index 100%
rename from tardis/randomkit/rk_sobol.h
rename to tardis/montecarlo/src/randomkit/rk_sobol.h
diff --git a/tardis/parallel.py b/tardis/parallel.py
deleted file mode 100644
index f6f9fd3e603..00000000000
--- a/tardis/parallel.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#parallel launcher scripts
-import tardis.simulation
-from IPython.parallel import require
-
-@require(tardis.simulation)
-def simulation_launcher(config_dict):
-    return tardis.simulation.run_multizone(config_dict, globals()['amodel'])
-
-
-def parallel_macro_multizone(lbv, default_dict, **kwargs):
-    #lbv = client.load_balanced_view()
-
-    config_dicts = []
-
-    for i in xrange(len(kwargs.items()[0])):
-        tmp_config_dict = default_dict.copy()
-        for key in kwargs:
-            tmp_config_dict[key] = kwargs[key][i]
-        config_dicts.append(tmp_config_dict)
-
-    specs = lbv.map_async(simulation_launcher, config_dicts)
-    return specs
\ No newline at end of file
diff --git a/tardis/setup_package.py b/tardis/setup_package.py
deleted file mode 100644
index defe4c24468..00000000000
--- a/tardis/setup_package.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#setting the right include
-from setuptools import Extension
-import numpy as np
-
-randomkit_files = ['tardis/randomkit/rk_isaac.c', 'tardis/randomkit/rk_mt.c',
-                   'tardis/randomkit/rk_primitive.c',
-                   'tardis/randomkit/rk_sobol.c']
-
-def get_extensions():
-    return [Extension('tardis.montecarlo',
-                      ['tardis/montecarlo.pyx', 'tardis/cmontecarlo.c'] +
-                      randomkit_files,
-                      include_dirs=['tardis/randomkit', np.get_include()])]