diff --git a/attract_server/__init__.py b/attract/__init__.py
similarity index 100%
rename from attract_server/__init__.py
rename to attract/__init__.py
diff --git a/attract_server/attrs_extra.py b/attract/attrs_extra.py
similarity index 100%
rename from attract_server/attrs_extra.py
rename to attract/attrs_extra.py
diff --git a/attract_server/cli.py b/attract/cli.py
similarity index 100%
rename from attract_server/cli.py
rename to attract/cli.py
diff --git a/attract_server/modules.py b/attract/modules.py
similarity index 100%
rename from attract_server/modules.py
rename to attract/modules.py
diff --git a/attract_server/node_types/__init__.py b/attract/node_types/__init__.py
similarity index 100%
rename from attract_server/node_types/__init__.py
rename to attract/node_types/__init__.py
diff --git a/attract_server/node_types/act.py b/attract/node_types/act.py
similarity index 100%
rename from attract_server/node_types/act.py
rename to attract/node_types/act.py
diff --git a/attract_server/node_types/scene.py b/attract/node_types/scene.py
similarity index 100%
rename from attract_server/node_types/scene.py
rename to attract/node_types/scene.py
diff --git a/attract_server/node_types/shot.py b/attract/node_types/shot.py
similarity index 100%
rename from attract_server/node_types/shot.py
rename to attract/node_types/shot.py
diff --git a/attract_server/node_types/task.py b/attract/node_types/task.py
similarity index 100%
rename from attract_server/node_types/task.py
rename to attract/node_types/task.py
diff --git a/attract_server/subversion.py b/attract/subversion.py
similarity index 100%
rename from attract_server/subversion.py
rename to attract/subversion.py
diff --git a/attract_server/task_manager.py b/attract/task_manager.py
similarity index 100%
rename from attract_server/task_manager.py
rename to attract/task_manager.py
diff --git a/attract/templates/attract/index.html b/attract/templates/attract/index.html
new file mode 100644
index 0000000..6efbb9a
--- /dev/null
+++ b/attract/templates/attract/index.html
@@ -0,0 +1,6 @@
+
+{% extends 'layout.html' %}
+{% block page_title %}Attract{% endblock %}
+{% block body %}
+<h1>Attract</h1>
+<p>This is Attract. Templates are found.</p>{% endblock %}
\ No newline at end of file
diff --git a/runserver.py b/runserver.py
index ebf544d..de15713 100755
--- a/runserver.py
+++ b/runserver.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from pillar import PillarServer
-from attract_server import AttractExtension
+from attract import AttractExtension
 
 app = PillarServer('.')
 app.load_extension(AttractExtension(), '/attract')
diff --git a/tests/abstract_attract_test.py b/tests/abstract_attract_test.py
index 13d3327..1f9bfda 100644
--- a/tests/abstract_attract_test.py
+++ b/tests/abstract_attract_test.py
@@ -1,5 +1,5 @@
 from pillar.tests import PillarTestServer, AbstractPillarTest
-from attract_server import AttractExtension
+from attract import AttractExtension
 
 
 class AttractTestServer(PillarTestServer):
diff --git a/tests/test_subversion.py b/tests/test_subversion.py
index 7b982a9..5407eca 100644
--- a/tests/test_subversion.py
+++ b/tests/test_subversion.py
@@ -12,7 +12,7 @@ import mock
 import svn.common
 
 import logging_config
-from attract_server import subversion
+from attract import subversion
 
 SVN_SERVER_URL = 'svn://biserver/agent327'