Converted core to maven folder order; added non-committed changes from before my HDD broke.