diff --git a/AutFN.jl b/AutFN.jl
index 54fa1c3..cf98640 100644
--- a/AutFN.jl
+++ b/AutFN.jl
@@ -1,8 +1,3 @@
-using JLD
-using JuMP
-import SCS: SCSSolver
-import Mosek: MosekSolver
-
 using Groups
 using ProgressMeter
 
@@ -146,20 +141,19 @@ function ΔandSDPconstraints(identity::AutWord, S::Vector{AutWord})
     # @assert length(B₄_images) == 3425657
 
     println("Creating product matrix...")
-    @time pm = create_product_matrix(B₂, B₄_images)
+    @time pm = PropertyT.create_product_matrix(B₂, B₄_images)
     println("Creating sdp_constratints...")
-    @time sdp_constraints = constraints_from_pm(pm)
+    @time sdp_constraints = PropertyT.constraints_from_pm(pm)
 
-    L_coeff = splaplacian_coeff(S, B₂, length(B₄_images))
-    Δ = GroupAlgebraElement(L_coeff, Array{Int,2}(pm))
+    L_coeff = PropertyT.splaplacian_coeff(S, B₂, length(B₄_images))
+    Δ = PropertyT.GroupAlgebraElement(L_coeff, Array{Int,2}(pm))
 
     return Δ, sdp_constraints
 end
 
 
-@everywhere push!(LOAD_PATH, "./")
 using GroupAlgebras
-include("property(T).jl")
+using PropertyT
 
 const symbols =  [FGSymbol("x₁",1), FGSymbol("x₂",1), FGSymbol("x₃",1), FGSymbol("x₄",1), FGSymbol("x₅",1), FGSymbol("x₆",1)]
 
diff --git a/SL3Z.jl b/SL3Z.jl
index 78b164c..62a908c 100644
--- a/SL3Z.jl
+++ b/SL3Z.jl
@@ -93,16 +93,16 @@ function products{T}(U::AbstractVector{T}, V::AbstractVector{T})
     return unique(result)
 end
 
-function ΔandSDPconstraints(identity, S)
+function ΔandSDPconstraints{T<:Number}(identity::Array{T,2}, S::Vector{Array{T,2}})
     B₁ = vcat([identity], S)
     B₂ = products(B₁, B₁);
     B₃ = products(B₁, B₂);
     B₄ = products(B₁, B₃);
     @assert B₄[1:length(B₂)] == B₂
 
-    product_matrix = create_product_matrix(B₄,length(B₂));
-    sdp_constraints = constraints_from_pm(product_matrix, length(B₄))
-    L_coeff = splaplacian_coeff(S, B₂, length(B₄));
+    product_matrix = PropertyT.create_product_matrix(B₄,length(B₂));
+    sdp_constraints = PropertyT.constraints_from_pm(product_matrix, length(B₄))
+    L_coeff = PropertyT.splaplacian_coeff(S, B₂, length(B₄));
     Δ = GroupAlgebraElement(L_coeff, product_matrix)
 
     return Δ, sdp_constraints