Some folder changes, started search and client

98 files changed, 98 insertions, 98 deletions

diff --git a/src/elements/O2.cpp b/src/elements/O2.cpp
index 78b4229..864d9e8 100644
--- a/src/elements/O2.cpp
+++ b/src/elements/O2.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_O2(UPDATE_FUNC_ARGS)
 {
diff --git a/src/elements/acel.cpp b/src/elements/acel.cpp
index 7ab9684..0d69894 100644
--- a/src/elements/acel.cpp
+++ b/src/elements/acel.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ACEL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/acid.cpp b/src/elements/acid.cpp
index 3a72b9d..8d881fd 100644
--- a/src/elements/acid.cpp
+++ b/src/elements/acid.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ACID(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;
diff --git a/src/elements/amtr.cpp b/src/elements/amtr.cpp
index d119cc9..5ff4529 100644
--- a/src/elements/amtr.cpp
+++ b/src/elements/amtr.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_AMTR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/anar.cpp b/src/elements/anar.cpp
index 83eaf5a..6db0d2e 100644
--- a/src/elements/anar.cpp
+++ b/src/elements/anar.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
  
 int update_ANAR(UPDATE_FUNC_ARGS) {
         int r, rx, ry;
diff --git a/src/elements/aray.cpp b/src/elements/aray.cpp
index 65b0d53..2ab9b40 100644
--- a/src/elements/aray.cpp
+++ b/src/elements/aray.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ARAY(UPDATE_FUNC_ARGS) {
 	int r, nxx, nyy, docontinue, nxi, nyi, rx, ry, nr, ry1, rx1;
diff --git a/src/elements/bang.cpp b/src/elements/bang.cpp
index 658a567..7a1f673 100644
--- a/src/elements/bang.cpp
+++ b/src/elements/bang.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BANG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;
diff --git a/src/elements/bcln.cpp b/src/elements/bcln.cpp
index 8c00f95..702b322 100644
--- a/src/elements/bcln.cpp
+++ b/src/elements/bcln.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BCLN(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life && sim->pv[y/CELL][x/CELL]>4.0f)
diff --git a/src/elements/bcol.cpp b/src/elements/bcol.cpp
index d941508..d727abf 100644
--- a/src/elements/bcol.cpp
+++ b/src/elements/bcol.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BCOL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, temp;
diff --git a/src/elements/bizr.cpp b/src/elements/bizr.cpp
index 538b87f..aae09d9 100644
--- a/src/elements/bizr.cpp
+++ b/src/elements/bizr.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 //Used by ALL 3 BIZR states
 int update_BIZR(UPDATE_FUNC_ARGS) {
diff --git a/src/elements/bmtl.cpp b/src/elements/bmtl.cpp
index a3dc4b8..8682561 100644
--- a/src/elements/bmtl.cpp
+++ b/src/elements/bmtl.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BMTL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, tempFactor;
diff --git a/src/elements/bomb.cpp b/src/elements/bomb.cpp
index b2e9e7d..b696b19 100644
--- a/src/elements/bomb.cpp
+++ b/src/elements/bomb.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BOMB(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;
diff --git a/src/elements/boyl.cpp b/src/elements/boyl.cpp
index e4ee6d2..7c0fc24 100644
--- a/src/elements/boyl.cpp
+++ b/src/elements/boyl.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BOYL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/brmt.cpp b/src/elements/brmt.cpp
index c23bd99..0e49cd1 100644
--- a/src/elements/brmt.cpp
+++ b/src/elements/brmt.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BRMT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, tempFactor;
diff --git a/src/elements/btry.cpp b/src/elements/btry.cpp
index 3f11003..0168e08 100644
--- a/src/elements/btry.cpp
+++ b/src/elements/btry.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BTRY(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt;
diff --git a/src/elements/c5.cpp b/src/elements/c5.cpp
index 412245f..8a10915 100644
--- a/src/elements/c5.cpp
+++ b/src/elements/c5.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_C5(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/caus.cpp b/src/elements/caus.cpp
index 2ec268e..fb71969 100644
--- a/src/elements/caus.cpp
+++ b/src/elements/caus.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CAUS(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;
diff --git a/src/elements/cbnw.cpp b/src/elements/cbnw.cpp
index cf0c13e..37625b0 100644
--- a/src/elements/cbnw.cpp
+++ b/src/elements/cbnw.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CBNW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, oldt;
diff --git a/src/elements/clne.cpp b/src/elements/clne.cpp
index 13b25b9..303908e 100644
--- a/src/elements/clne.cpp
+++ b/src/elements/clne.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CLNE(UPDATE_FUNC_ARGS) {
 	if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT)))
diff --git a/src/elements/clst.cpp b/src/elements/clst.cpp
index 2c31d87..f8653be 100644
--- a/src/elements/clst.cpp
+++ b/src/elements/clst.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CLST(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/co2.cpp b/src/elements/co2.cpp
index 5a3bbf5..62bc646 100644
--- a/src/elements/co2.cpp
+++ b/src/elements/co2.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CO2(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/coal.cpp b/src/elements/coal.cpp
index 256aa69..23d20ba 100644
--- a/src/elements/coal.cpp
+++ b/src/elements/coal.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_COAL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, temp;
diff --git a/src/elements/conv.cpp b/src/elements/conv.cpp
index ce4ee48..a62cd55 100644
--- a/src/elements/conv.cpp
+++ b/src/elements/conv.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CONV(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/dest.cpp b/src/elements/dest.cpp
index 014fad4..fa5faf8 100644
--- a/src/elements/dest.cpp
+++ b/src/elements/dest.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DEST(UPDATE_FUNC_ARGS) {
 	int r,rx,ry,topv;
diff --git a/src/elements/deut.cpp b/src/elements/deut.cpp
index 03de364..cee38de 100644
--- a/src/elements/deut.cpp
+++ b/src/elements/deut.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DEUT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;
diff --git a/src/elements/dlay.cpp b/src/elements/dlay.cpp
index 4643b30..e40c362 100644
--- a/src/elements/dlay.cpp
+++ b/src/elements/dlay.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DLAY(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, oldl;
diff --git a/src/elements/dstw.cpp b/src/elements/dstw.cpp
index 03ae7dd..21d7db2 100644
--- a/src/elements/dstw.cpp
+++ b/src/elements/dstw.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DSTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/elec.cpp b/src/elements/elec.cpp
index 6b06f8f..e8ddf5e 100644
--- a/src/elements/elec.cpp
+++ b/src/elements/elec.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ELEC(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry, nb, rrx, rry;
diff --git a/src/elements/elementmisc.cpp b/src/elements/elementmisc.cpp
index a169e80..4df53f4 100644
--- a/src/elements/elementmisc.cpp
+++ b/src/elements/elementmisc.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MISC(UPDATE_FUNC_ARGS) {
 	/*int t = parts[i].type;
diff --git a/src/elements/emp.cpp b/src/elements/emp.cpp
index a187196..2b3db86 100644
--- a/src/elements/emp.cpp
+++ b/src/elements/emp.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_EMP(UPDATE_FUNC_ARGS) {
 	int r,rx,ry,ok=0,t,n,nx,ny;
diff --git a/src/elements/figh.cpp b/src/elements/figh.cpp
index 8b18871..35b5a20 100644
--- a/src/elements/figh.cpp
+++ b/src/elements/figh.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FIGH(UPDATE_FUNC_ARGS)
 {
diff --git a/src/elements/fire.cpp b/src/elements/fire.cpp
index 1f9c0c2..3f36916 100644
--- a/src/elements/fire.cpp
+++ b/src/elements/fire.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_FIRE(GRAPHICS_FUNC_ARGS)
 {
diff --git a/src/elements/firw.cpp b/src/elements/firw.cpp
index 74605b0..ffd7941 100644
--- a/src/elements/firw.cpp
+++ b/src/elements/firw.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FIRW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, np;
diff --git a/src/elements/fog.cpp b/src/elements/fog.cpp
index 28952e9..24ea953 100644
--- a/src/elements/fog.cpp
+++ b/src/elements/fog.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FOG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/frzw.cpp b/src/elements/frzw.cpp
index 932bccb..4569911 100644
--- a/src/elements/frzw.cpp
+++ b/src/elements/frzw.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FRZW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/frzz.cpp b/src/elements/frzz.cpp
index 8e09c1d..b412cbc 100644
--- a/src/elements/frzz.cpp
+++ b/src/elements/frzz.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FRZZ(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fsep.cpp b/src/elements/fsep.cpp
index 3db5ba5..347fc46 100644
--- a/src/elements/fsep.cpp
+++ b/src/elements/fsep.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FSEP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fuse.cpp b/src/elements/fuse.cpp
index e1db1ff..9081b21 100644
--- a/src/elements/fuse.cpp
+++ b/src/elements/fuse.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FUSE(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fwrk.cpp b/src/elements/fwrk.cpp
index d217ad9..1838dde 100644
--- a/src/elements/fwrk.cpp
+++ b/src/elements/fwrk.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FWRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;
diff --git a/src/elements/gbmb.cpp b/src/elements/gbmb.cpp
index 95afc4e..d1d7c20 100644
--- a/src/elements/gbmb.cpp
+++ b/src/elements/gbmb.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 int update_GBMB(UPDATE_FUNC_ARGS) {
 	int rx,ry,r;
 	if (parts[i].life<=0)
diff --git a/src/elements/glas.cpp b/src/elements/glas.cpp
index e8c0a6c..ef9e7f7 100644
--- a/src/elements/glas.cpp
+++ b/src/elements/glas.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GLAS(UPDATE_FUNC_ARGS) {
 	parts[i].pavg[0] = parts[i].pavg[1];
diff --git a/src/elements/glow.cpp b/src/elements/glow.cpp
index e83e2f4..38f7140 100644
--- a/src/elements/glow.cpp
+++ b/src/elements/glow.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GLOW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/goo.cpp b/src/elements/goo.cpp
index c305182..6e66468 100644
--- a/src/elements/goo.cpp
+++ b/src/elements/goo.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GOO(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life && sim->pv[y/CELL][x/CELL]>1.0f)
diff --git a/src/elements/gpmp.cpp b/src/elements/gpmp.cpp
index dcde7a9..3ad552b 100644
--- a/src/elements/gpmp.cpp
+++ b/src/elements/gpmp.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GPMP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/graphics_default.cpp b/src/elements/graphics_default.cpp
index 1270977..cf394aa 100644
--- a/src/elements/graphics_default.cpp
+++ b/src/elements/graphics_default.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_DEFAULT(GRAPHICS_FUNC_ARGS)
 {	
diff --git a/src/elements/h2.cpp b/src/elements/h2.cpp
index da39ad0..3a92cfe 100644
--- a/src/elements/h2.cpp
+++ b/src/elements/h2.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_H2(UPDATE_FUNC_ARGS)
 {
diff --git a/src/elements/hswc.cpp b/src/elements/hswc.cpp
index c727395..a279947 100644
--- a/src/elements/hswc.cpp
+++ b/src/elements/hswc.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_HSWC(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/ice.cpp b/src/elements/ice.cpp
index aece17b..aab4e0e 100644
--- a/src/elements/ice.cpp
+++ b/src/elements/ice.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ICEI(UPDATE_FUNC_ARGS) { //currently used for snow as well
 	int r, rx, ry;
diff --git a/src/elements/ignt.cpp b/src/elements/ignt.cpp
index 1d7ea64..66b0e18 100644
--- a/src/elements/ignt.cpp
+++ b/src/elements/ignt.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_IGNT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/iron.cpp b/src/elements/iron.cpp
index b887cf8..391b708 100644
--- a/src/elements/iron.cpp
+++ b/src/elements/iron.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_IRON(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/isz.cpp b/src/elements/isz.cpp
index 25446d2..22e6c77 100644
--- a/src/elements/isz.cpp
+++ b/src/elements/isz.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ISZ(UPDATE_FUNC_ARGS) { // for both ISZS and ISOZ
 	float rr, rrr;
diff --git a/src/elements/lava.cpp b/src/elements/lava.cpp
index 3d7827b..cc0fbb3 100644
--- a/src/elements/lava.cpp
+++ b/src/elements/lava.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_LAVA(GRAPHICS_FUNC_ARGS)
 {
diff --git a/src/elements/lcry.cpp b/src/elements/lcry.cpp
index 546c2ca..0ecb84c 100644
--- a/src/elements/lcry.cpp
+++ b/src/elements/lcry.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_LCRY(UPDATE_FUNC_ARGS)
 {
diff --git a/src/elements/legacy.cpp b/src/elements/legacy.cpp
index dd58173..f1fcf03 100644
--- a/src/elements/legacy.cpp
+++ b/src/elements/legacy.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 // Interactions which only occur when legacy_enable is on
 int update_legacy_all(UPDATE_FUNC_ARGS) {
diff --git a/src/elements/ligh.cpp b/src/elements/ligh.cpp
index 8108c4b..5249c4f 100644
--- a/src/elements/ligh.cpp
+++ b/src/elements/ligh.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 #define LIGHTING_POWER 0.65
 
diff --git a/src/elements/merc.cpp b/src/elements/merc.cpp
index 2df113b..58b19a3 100644
--- a/src/elements/merc.cpp
+++ b/src/elements/merc.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MERC(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;
diff --git a/src/elements/mort.cpp b/src/elements/mort.cpp
index bbb6264..9de088f 100644
--- a/src/elements/mort.cpp
+++ b/src/elements/mort.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MORT(UPDATE_FUNC_ARGS) {
 	sim->create_part(-1, x, y-1, PT_SMKE);
diff --git a/src/elements/nbhl.cpp b/src/elements/nbhl.cpp
index 056313c..565416f 100644
--- a/src/elements/nbhl.cpp
+++ b/src/elements/nbhl.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NBHL(UPDATE_FUNC_ARGS) {
 	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += 0.1f;
diff --git a/src/elements/neut.cpp b/src/elements/neut.cpp
index a48fc09..c804106 100644
--- a/src/elements/neut.cpp
+++ b/src/elements/neut.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 
 int create_n_parts(Simulation * sim, int n, int x, int y, float vx, float vy, float temp, int t)//testing a new deut create part
diff --git a/src/elements/newgraphics.cpp b/src/elements/newgraphics.cpp
index 83da27b..036a6a7 100644
--- a/src/elements/newgraphics.cpp
+++ b/src/elements/newgraphics.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 #include "hmap.h"
 
 int graphics_QRTZ(GRAPHICS_FUNC_ARGS) //QRTZ and PQRT
diff --git a/src/elements/none.cpp b/src/elements/none.cpp
index 50f301f..6974e6c 100644
--- a/src/elements/none.cpp
+++ b/src/elements/none.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_(UPDATE_FUNC_ARGS) {
 
diff --git a/src/elements/nptct.cpp b/src/elements/nptct.cpp
index 2d68a9b..f8e29e6 100644
--- a/src/elements/nptct.cpp
+++ b/src/elements/nptct.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NPTCT(UPDATE_FUNC_ARGS) {
 	if (parts[i].temp>295.0f)
diff --git a/src/elements/nwhl.cpp b/src/elements/nwhl.cpp
index f53b657..cae189a 100644
--- a/src/elements/nwhl.cpp
+++ b/src/elements/nwhl.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NWHL(UPDATE_FUNC_ARGS) {
 	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] -= 0.1f;
diff --git a/src/elements/pbcn.cpp b/src/elements/pbcn.cpp
index 7e99397..a6bbe5a 100644
--- a/src/elements/pbcn.cpp
+++ b/src/elements/pbcn.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PBCN(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/pcln.cpp b/src/elements/pcln.cpp
index cd1ed4f..beb4a9a 100644
--- a/src/elements/pcln.cpp
+++ b/src/elements/pcln.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PCLN(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/phot.cpp b/src/elements/phot.cpp
index 3ed6b5d..407ac2e 100644
--- a/src/elements/phot.cpp
+++ b/src/elements/phot.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PHOT(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry;
diff --git a/src/elements/pipe.cpp b/src/elements/pipe.cpp
index 08432f5..40ef411 100644
--- a/src/elements/pipe.cpp
+++ b/src/elements/pipe.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 signed char pos_1_rx[] = {-1,-1,-1, 0, 0, 1, 1, 1};
 signed char pos_1_ry[] = {-1, 0, 1,-1, 1,-1, 0, 1};
diff --git a/src/elements/plnt.cpp b/src/elements/plnt.cpp
index a44c8c2..ef7985f 100644
--- a/src/elements/plnt.cpp
+++ b/src/elements/plnt.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PLNT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;
diff --git a/src/elements/plsm.cpp b/src/elements/plsm.cpp
index c6f7c20..f8b3865 100644
--- a/src/elements/plsm.cpp
+++ b/src/elements/plsm.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 #include "hmap.h"
 
 int graphics_PLSM(GRAPHICS_FUNC_ARGS)
diff --git a/src/elements/plut.cpp b/src/elements/plut.cpp
index 3e2820d..7c51b2d 100644
--- a/src/elements/plut.cpp
+++ b/src/elements/plut.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PLUT(UPDATE_FUNC_ARGS) {
 	if (1>rand()%100 && ((int)(5.0f*sim->pv[y/CELL][x/CELL]))>(rand()%1000))
diff --git a/src/elements/prti.cpp b/src/elements/prti.cpp
index df212d4..9bbbf26 100644
--- a/src/elements/prti.cpp
+++ b/src/elements/prti.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 /*these are the count values of where the particle gets stored, depending on where it came from
    0 1 2
    7 . 3
diff --git a/src/elements/prto.cpp b/src/elements/prto.cpp
index ee61abf..32e7251 100644
--- a/src/elements/prto.cpp
+++ b/src/elements/prto.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 /*these are the count values of where the particle gets stored, depending on where it came from
    0 1 2
    7 . 3
diff --git a/src/elements/pump.cpp b/src/elements/pump.cpp
index 8a7254e..af05c02 100644
--- a/src/elements/pump.cpp
+++ b/src/elements/pump.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PUMP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/pvod.cpp b/src/elements/pvod.cpp
index e645d0a..1a48ca8 100644
--- a/src/elements/pvod.cpp
+++ b/src/elements/pvod.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PVOD(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/pyro.cpp b/src/elements/pyro.cpp
index 790e295..81f00f7 100644
--- a/src/elements/pyro.cpp
+++ b/src/elements/pyro.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PYRO(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, t = parts[i].type;
diff --git a/src/elements/qrtz.cpp b/src/elements/qrtz.cpp
index 7768765..c33cacb 100644
--- a/src/elements/qrtz.cpp
+++ b/src/elements/qrtz.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_QRTZ(UPDATE_FUNC_ARGS) {
 	int r, tmp, trade, rx, ry, np, t;
diff --git a/src/elements/rime.cpp b/src/elements/rime.cpp
index 617414b..878b928 100644
--- a/src/elements/rime.cpp
+++ b/src/elements/rime.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_RIME(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/shld.cpp b/src/elements/shld.cpp
index cbe8306..ade7edb 100644
--- a/src/elements/shld.cpp
+++ b/src/elements/shld.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SHLD1(UPDATE_FUNC_ARGS) {
 	int r, nnx, nny, rx, ry;
diff --git a/src/elements/sing.cpp b/src/elements/sing.cpp
index fa6121c..de1e329 100644
--- a/src/elements/sing.cpp
+++ b/src/elements/sing.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SING(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, cry, crx, rad, nxi, nxj, nb, j, spawncount;
diff --git a/src/elements/sltw.cpp b/src/elements/sltw.cpp
index c965fd4..507602c 100644
--- a/src/elements/sltw.cpp
+++ b/src/elements/sltw.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SLTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/smke.cpp b/src/elements/smke.cpp
index d19bd0a..e9311bd 100644
--- a/src/elements/smke.cpp
+++ b/src/elements/smke.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_SMKE(GRAPHICS_FUNC_ARGS)
 {
diff --git a/src/elements/soap.cpp b/src/elements/soap.cpp
index 0d31292..0d1054f 100644
--- a/src/elements/soap.cpp
+++ b/src/elements/soap.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SOAP(UPDATE_FUNC_ARGS) 
 {
diff --git a/src/elements/spng.cpp b/src/elements/spng.cpp
index 28b3e1b..868b1e6 100644
--- a/src/elements/spng.cpp
+++ b/src/elements/spng.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPNG(UPDATE_FUNC_ARGS) {
 	int r, trade, rx, ry, tmp, np;
diff --git a/src/elements/sprk.cpp b/src/elements/sprk.cpp
index 244e831..80f66a2 100644
--- a/src/elements/sprk.cpp
+++ b/src/elements/sprk.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype;
diff --git a/src/elements/stkm.cpp b/src/elements/stkm.cpp
index 322eba1..c457b62 100644
--- a/src/elements/stkm.cpp
+++ b/src/elements/stkm.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPAWN(UPDATE_FUNC_ARGS) {
 	if (!sim->player.spwn)
diff --git a/src/elements/stkm2.cpp b/src/elements/stkm2.cpp
index 967bea2..d18a7ac 100644
--- a/src/elements/stkm2.cpp
+++ b/src/elements/stkm2.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPAWN2(UPDATE_FUNC_ARGS) {
 	if (!sim->player2.spwn)
diff --git a/src/elements/stor.cpp b/src/elements/stor.cpp
index 66eb072..414caad 100644
--- a/src/elements/stor.cpp
+++ b/src/elements/stor.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_STOR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np, rx1, ry1;
diff --git a/src/elements/swch.cpp b/src/elements/swch.cpp
index ee2c467..f37192b 100644
--- a/src/elements/swch.cpp
+++ b/src/elements/swch.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SWCH(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry;
diff --git a/src/elements/thdr.cpp b/src/elements/thdr.cpp
index f7f95b4..1e3d0ab 100644
--- a/src/elements/thdr.cpp
+++ b/src/elements/thdr.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_THDR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/thrm.cpp b/src/elements/thrm.cpp
index 91939e6..2075e13 100644
--- a/src/elements/thrm.cpp
+++ b/src/elements/thrm.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_THRM(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/uran.cpp b/src/elements/uran.cpp
index a8b2a06..31e93a7 100644
--- a/src/elements/uran.cpp
+++ b/src/elements/uran.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_URAN(UPDATE_FUNC_ARGS) {
 	if (!sim->legacy_enable && sim->pv[y/CELL][x/CELL]>0.0f)
diff --git a/src/elements/vine.cpp b/src/elements/vine.cpp
index 165d391..c8d51ba 100644
--- a/src/elements/vine.cpp
+++ b/src/elements/vine.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_VINE(UPDATE_FUNC_ARGS) {
 	int r, np, rx =(rand()%3)-1, ry=(rand()%3)-1;
diff --git a/src/elements/warp.cpp b/src/elements/warp.cpp
index ddc1b81..88315a9 100644
--- a/src/elements/warp.cpp
+++ b/src/elements/warp.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_WARP(UPDATE_FUNC_ARGS) {
 	int trade, r, rx, ry;
diff --git a/src/elements/watr.cpp b/src/elements/watr.cpp
index 09b66a9..b44fa22 100644
--- a/src/elements/watr.cpp
+++ b/src/elements/watr.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/element.h"
 
 int update_WATR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/wifi.cpp b/src/elements/wifi.cpp
index ee5e264..cb77dd9 100644
--- a/src/elements/wifi.cpp
+++ b/src/elements/wifi.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_WIFI(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/wire.cpp b/src/elements/wire.cpp
index 49d3720..f7202e4 100644
--- a/src/elements/wire.cpp
+++ b/src/elements/wire.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
  
 int update_WIRE(UPDATE_FUNC_ARGS) {
     int s,r,rx,ry,count;    
diff --git a/src/elements/wtrv.cpp b/src/elements/wtrv.cpp
index de0eae4..2e3838a 100644
--- a/src/elements/wtrv.cpp
+++ b/src/elements/wtrv.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_WTRV(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/yest.cpp b/src/elements/yest.cpp
index c6c7db6..5b3fc95 100644
--- a/src/elements/yest.cpp
+++ b/src/elements/yest.cpp
@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_YEST(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;