diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index 6b2b004..dc2d62b 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -1,17 +1,12 @@
 # This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
 module JuliaFEM
 
-# package code goes here
-type Node
-    node_id
-    coords
-end
-type Element
-    element_id
-    node_ids
-end
-function test()
-    return 1
+type Model
+    model  # For global variables
+    nodes  # For nodes
+    elements  # For elements
+    element_nodes  # For element nodes
+    element_gauss_points  # For element gauss points
 end
 
 end # module
diff --git a/test/runtests.jl b/test/runtests.jl
index 5a025bf..2232d23 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,8 +1,16 @@
 using JuliaFEM
 using Base.Test
 
+function test_create_model()
+    m = new_model()
+    fn = fieldnames(m)
+    @assert :model in fn
+    @assert :nodes in fn
+    @assert :elements in fn
+    @assert :element_nodes in fn
+    @assert :element_gauss_points in fn
+end
+
 # write your own tests here
-@test 1 == JuliaFEM.test()
-
-
-@test_approx_eq 1.0 1.0
+# @test 1 == JuliaFEM.test()
+# @test_approx_eq 1.0 1.0