diff --git a/data/index.md b/data/index.md
index ec1aa7c..086acd7 100644
--- a/data/index.md
+++ b/data/index.md
@@ -1 +1,3 @@
-title: Stuff Sample
+title: IndexPage
+
+asdfasdfasdf
\ No newline at end of file
diff --git a/data/ghg/index.md b/data/topic1/index.md
similarity index 100%
rename from data/ghg/index.md
rename to data/topic1/index.md
diff --git a/data/ghg/test.jpg b/data/topic1/test.jpg
similarity index 100%
rename from data/ghg/test.jpg
rename to data/topic1/test.jpg
diff --git a/data/ghg/test.md b/data/topic1/test.md
similarity index 100%
rename from data/ghg/test.md
rename to data/topic1/test.md
diff --git a/data/tg/index.md b/data/topic2/index.md
similarity index 100%
rename from data/tg/index.md
rename to data/topic2/index.md
diff --git a/flaskpages/pages.py b/flaskpages/pages.py
index befdf8f..a381b2c 100644
--- a/flaskpages/pages.py
+++ b/flaskpages/pages.py
@@ -6,11 +6,11 @@ import flatpages_index
 def create_bp(app):
 
     flatpages = FlatPagesIndex(app)
-    flatpages_index.Links.endpoint="stuff.page"
+    flatpages_index.Links.endpoint="pages.page"
     flatpages_index.Links.url=(lambda s,x: url_for(s.endpoint, name=x))
     #flatpages_index.Links.image_url=(lambda s,x: url_for('stuff.page', name=x))
-    flatpages_index.Links.file_url=(lambda s,x: url_for('stuff.page', name=x))
-    flatpages_index.Links.thumb_url=(lambda s,x: url_for('stuff.thumb', size=128,name=x))
+    flatpages_index.Links.file_url=(lambda s,x: url_for('pages.page', name=x))
+    flatpages_index.Links.thumb_url=(lambda s,x: url_for('pages.thumb', size=128,name=x))
 
     flatpages.get('index')
     app.logger.debug('flatpages loaded %d pages' % len(flatpages._pages))
@@ -28,7 +28,7 @@ def create_bp(app):
         
         if page:
             page["has_img"]=True
-            page.links.endpoint='stuff.page'
+            page.links.endpoint='pages.page'
             return render_template(page["template"], post=page,
                                 pth=page["dirpath"])
 
@@ -45,7 +45,7 @@ def create_bp(app):
         page = flatpages.get(name)
         if not page is None:
             page["has_img"]=False
-            page.links.endpoint='stuff.pagejson'
+            page.links.endpoint='pages.pagejson'
     #        page.links.file_url=lambda n: url_for('intern.post', name=n)
             return jsonify(page=dict(page))
         
diff --git a/instance/templates/layout.html b/flaskpages/templates/layout.html
similarity index 100%
rename from instance/templates/layout.html
rename to flaskpages/templates/layout.html
diff --git a/instance/templates/page.html b/flaskpages/templates/page.html
similarity index 100%
rename from instance/templates/page.html
rename to flaskpages/templates/page.html
diff --git a/instance/templates/page_plain.html b/flaskpages/templates/page_plain.html
similarity index 100%
rename from instance/templates/page_plain.html
rename to flaskpages/templates/page_plain.html
diff --git a/instance/templates/title.html b/flaskpages/templates/title.html
similarity index 100%
rename from instance/templates/title.html
rename to flaskpages/templates/title.html
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_basic.py b/tests/test_basic.py
new file mode 100644
index 0000000..25b0fa9
--- /dev/null
+++ b/tests/test_basic.py
@@ -0,0 +1,32 @@
+from .test_fixtures import client,app
+import json
+import logging
+import pytest
+
+@pytest.fixture
+def index_html(client):
+    resp = client.get('/index/')    
+    data= resp.get_data(as_text=True)  
+    return data
+    
+def test_index(app,client):
+    # Try to get "index"
+    resp = client.get('index.json')
+    data = json.loads(resp.get_data(as_text=True))
+    assert resp.status_code == 200
+    assert data['page']['title'] == "IndexPage"
+
+
+def test_index_html(app,client):
+    # Try to get "index"
+    resp = client.get('/index/')
+    #data= resp.get_data(as_text=True)   
+    #app.logger.debug()
+    
+    assert resp.status_code == 200
+
+def test_links_in_index(index_html):
+    assert 'href="/topic1/"' in index_html
+    
+def test_text_in_index(index_html):
+    assert 'asdfasdfasdf' in index_html
\ No newline at end of file
diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
new file mode 100644
index 0000000..bbbb9d3
--- /dev/null
+++ b/tests/test_fixtures.py
@@ -0,0 +1,10 @@
+import os
+import pytest
+from flaskpages import create_app
+
+@pytest.fixture
+def app():
+    return create_app()
+@pytest.fixture
+def client(app):
+    return app.test_client()