143 files changed, 32 insertions, 460 deletions
diff --git a/.travis.yml b/.travis.yml
index 8c064ac..d70a43b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,5 +18,5 @@ before_install:
 
 # command to run tests
 script: 
-  - nosetests ./testapp/tests/
+  - nosetests ./yaksh/tests/
   - python manage.py test
 \ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 06a9b7d..dbaf299 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,8 @@
 include LICENSE
 include README.rst
-exclude testapp/production.py
-exclude testapp/settings.py
-exclude testapp/urls.py
-exclude testapp/test_server.py
-exclude testapp/manage.py
-recursive-exclude testapp/myauthentication *
-recursive-include testapp/yaksh/static *
-recursive-include testapp/yaksh/templates *
-recursive-include testapp/yaksh/management *
-recursive-include testapp/yaksh/output *
-recursive-include testapp/yaksh/fixtures *
+recursive-include yaksh/static *
+recursive-include yaksh/templates *
+recursive-include yaksh/demo_templates *
+recursive-include yaksh/management *
+recursive-include yaksh/output *
+recursive-include yaksh/fixtures *
diff --git a/README.md b/README.md
index c4eb503..45c3e4f 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Production Deployment
     
     1. mysql> grant all privileges on yaksh.* to yaksh_user@localhost;
  
- 1. Create a file named `local.py` in folder `testapp` and insert `DATABASE_PASSWORD = 'mysecretpassword'` and `DATABASE_USER = 'yaksh_user'`
+ 1. Add `DATABASE_PASSWORD = 'mysecretpassword'` and `DATABASE_USER = 'yaksh_user'` to online_test/settings.py
 
 To deploy this app follow the steps below:
 
@@ -104,7 +104,7 @@ To deploy this app follow the steps below:
     
  1. First run the python server provided. This ensures that the code is executed in a safe environment.  Do this like so:
     
-        $ sudo python testapp/yaksh/code_server.py
+        $ sudo python yaksh/code_server.py
       
     Put this in the background once it has started since this will not
     return back the prompt.  It is important that the server be running
@@ -177,7 +177,7 @@ To install this app follow the steps below:
     
  1. First run the python server provided. This ensures that the code is executed in a safe environment.  Do this like so:
     
-      $ sudo python testapp/yaksh/code_server.py
+      $ sudo python yaksh/code_server.py
       
     Put this in the background once it has started since this will not
     return back the prompt.  It is important that the server be running
diff --git a/online_test/settings.py b/online_test/settings.py
index 6ec9437..e46b055 100644
--- a/online_test/settings.py
+++ b/online_test/settings.py
@@ -37,7 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'testapp.yaksh',
+    'yaksh',
     'taggit',
 )
 
diff --git a/online_test/urls.py b/online_test/urls.py
index aa97523..0415511 100644
--- a/online_test/urls.py
+++ b/online_test/urls.py
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^exam/', include('testapp.yaksh.urls')),
+    url(r'^exam/', include('yaksh.urls')),
 )
diff --git a/setup.py b/setup.py
index 0010fd4..839607e 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
     license='BSD License',
     entry_points = {
             'console_scripts': [
-                'yaksh = testapp.scripts.yaksh:main',
+                'yaksh = yaksh.scripts.yaksh:main',
             ],
     },
     description='A django app to conduct online tests.',
diff --git a/testapp/myauthentication/README b/testapp/myauthentication/README
deleted file mode 100644
index 4aef3c5..0000000
--- a/testapp/myauthentication/README
+++ /dev/null
@@ -1,12 +0,0 @@
-To use authentication from external source, follow the instructions given below:
-
-1.  In settings.py, 
-    Uncomment AUTHENTICATION_BACKENDS = ('myauthentication.backend.MyBackend',)
-    Uncomment AUTHENTICATION_BACKENDS = ('myauthentication.backend.MyBackend',)
-    Enter database name, username and password for the spoken tutorial database.
-
-2. From login.html template comment 'New User? Sign-Up' link.
-   This is to be done so that user will register only from external
-   application and their details will be stored in the external database.
-
-3. In urls.py comment 'register' url pattern.
diff --git a/testapp/myauthentication/backend.py b/testapp/myauthentication/backend.py
deleted file mode 100644
index 721fe54..0000000
--- a/testapp/myauthentication/backend.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import hashlib
-from django.contrib.auth.models import User, check_password
-from models_spoken_tutorial import MoodleUser
-
-
-class MyBackend:
-    supports_object_permissions = False
-    supports_anonymous_user = False
-    supports_inactive_user = False
-
-    def authenticate(self, username=None, password=None):
-        '''
-            Checks username and password with external User table.
-            If valid then adds the user details in django User table
-            and authenticates the user.
-        '''
-        try:
-            user = MoodleUser.objects.get(username=username)
-            pwd = user.password
-            uid = user.id
-            firstname = user.firstname
-            lastname = user.lastname
-            email_id = user.email
-            p = hashlib.md5(password)
-            pwd_valid = (pwd == p.hexdigest())
-            if user and pwd_valid:
-                try:
-                    user = User.objects.get(username=username)
-                    return user
-                except Exception, e:
-                    user = User(id=uid, username=username, password=pwd,
-                                first_name=firstname, last_name=lastname,
-                                email=email_id)
-                    user.save()
-                    return user
-        except Exception, e:
-            return None
-
-    def get_user(self, user_id):
-        try:
-            return User.objects.get(pk=user_id)
-        except Exception, e:
-            return None
diff --git a/testapp/myauthentication/models_spoken_tutorial.py b/testapp/myauthentication/models_spoken_tutorial.py
deleted file mode 100644
index d333400..0000000
--- a/testapp/myauthentication/models_spoken_tutorial.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is an auto-generated Django model module.
-# You'll have to do the following manually to clean this up:
-#     * Rearrange models' order
-#     * Make sure each model has one field with primary_key=True
-# Feel free to rename the models, but don't rename db_table values or field names.
-#
-# Also note: You'll have to insert the output of 'django-admin.py sqlcustom [appname]'
-# into your database.
-
-from django.db import models
-
-class MoodleUser(models.Model):
-    id = models.BigIntegerField(primary_key=True)
-    username = models.CharField(unique=True, max_length=300)
-    password = models.CharField(max_length=96)
-    idnumber = models.CharField(max_length=765)
-    firstname = models.CharField(max_length=300)
-    lastname = models.CharField(max_length=300)
-    email = models.CharField(max_length=300)
-    institution = models.CharField(max_length=120)
-    department = models.CharField(max_length=90)
-    address = models.CharField(max_length=210)
-    city = models.CharField(max_length=360)
-    country = models.CharField(max_length=6)
-    class Meta:
-        db_table = u'mdl_user'
diff --git a/testapp/myauthentication/router.py b/testapp/myauthentication/router.py
deleted file mode 100644
index 3d9c330..0000000
--- a/testapp/myauthentication/router.py
+++ /dev/null
@@ -1,12 +0,0 @@
-class MyDatabaseRouter(object):
-    """
-        A router to manage database operations in the myauthentication app.
-    """
-    def db_for_read(self, model, **hints):
-        """
-            Point all read operations on myauthentication app to spoken
-            database.
-        """
-        if model._meta.app_label == 'myauthentication':
-            return 'spoken_tutorial'
-        return None
diff --git a/testapp/myauthentication/tests.py b/testapp/myauthentication/tests.py
deleted file mode 100644
index 4103038..0000000
--- a/testapp/myauthentication/tests.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#This file demonstrates writing tests using the unittest module. These will pass
-#when you run "manage.py test".
-
-#Write appropriate tests for the application.
-
diff --git a/testapp/myauthentication/urls.py b/testapp/myauthentication/urls.py
deleted file mode 100644
index e69de29..0000000
--- a/testapp/myauthentication/urls.py
+++ /dev/null
diff --git a/testapp/myauthentication/views.py b/testapp/myauthentication/views.py
deleted file mode 100644
index 60f00ef..0000000
--- a/testapp/myauthentication/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.
diff --git a/testapp/tests/test_bash_evaluation.py b/testapp/tests/test_bash_evaluation.py
deleted file mode 100644
index 4f7e4b6..0000000
--- a/testapp/tests/test_bash_evaluation.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import unittest
-import os
-from testapp.yaksh.bash_code_evaluator import BashCodeEvaluator
-from testapp.yaksh.settings import SERVER_TIMEOUT
-
-class BashEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "bash"
-        self.ref_code_path = "bash_files/sample.sh,bash_files/sample.args"
-        self.in_dir = "/tmp"
-        self.test_case_data = []
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-        self.test = None
-
-    def test_correct_answer(self):
-        user_answer = "#!/bin/bash\n[[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 ))"
-        get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_error(self):
-        user_answer = "#!/bin/bash\n[[ $# -eq 2 ]] && echo $(( $1 - $2 )) && exit $(( $1 - $2 ))"
-        get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertFalse(result.get("success"))
-        self.assertTrue("Error" in result.get("error"))
-
-    def test_infinite_loop(self):
-        user_answer = "#!/bin/bash\nwhile [ 1 ] ; do echo "" > /dev/null ; done"
-        get_class = BashCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/tests/test_c_cpp_evaluation.py b/testapp/tests/test_c_cpp_evaluation.py
deleted file mode 100644
index 9cbc013..0000000
--- a/testapp/tests/test_c_cpp_evaluation.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import unittest
-import os
-from testapp.yaksh.cpp_code_evaluator import CppCodeEvaluator
-from testapp.yaksh.settings import SERVER_TIMEOUT
-
-class CEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "C"
-        self.ref_code_path = "c_cpp_files/main.cpp"
-        self.in_dir = "/tmp"
-        self.test_case_data = []
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-        self.test = None
-
-    def test_correct_answer(self):
-        user_answer = "int add(int a, int b)\n{return a+b;}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_compilation_error(self):
-        user_answer = "int add(int a, int b)\n{return a+b}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertFalse(result.get("success"))
-        self.assertTrue("Compilation Error" in result.get("error"))
-
-    def test_infinite_loop(self):
-        user_answer = "int add(int a, int b)\n{while(1>0){}}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
- 
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-
-###############################################################################
-class CppEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "CPP"
-        self.ref_code_path = "c_cpp_files/main.cpp"
-        self.in_dir = "/tmp"
-        self.test_case_data = []
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-        self.test = None
-
-    def test_correct_answer(self):
-        user_answer = "int add(int a, int b)\n{return a+b;}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_compilation_error(self):
-        user_answer = "int add(int a, int b)\n{return a+b}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertFalse(result.get("success"))
-        self.assertTrue("Compilation Error" in result.get("error"))
-
-    def test_infinite_loop(self):
-        user_answer = "int add(int a, int b)\n{while(1>0){}}"
-        get_class = CppCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
- 
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/tests/test_code_evaluation.py b/testapp/tests/test_code_evaluation.py
deleted file mode 100644
index 10b88b5..0000000
--- a/testapp/tests/test_code_evaluation.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import unittest
-import os
-from testapp.yaksh import python_code_evaluator
-from testapp.yaksh.language_registry import _LanguageRegistry, set_registry, get_registry
-from testapp.yaksh.settings import SERVER_TIMEOUT
-
-
-class RegistryTestCase(unittest.TestCase):
-    def setUp(self):
-        set_registry()
-        self.registry_object = get_registry()
-        self.language_registry = _LanguageRegistry()
-
-    def test_set_register(self):
-        class_name = getattr(python_code_evaluator, 'PythonCodeEvaluator')
-        self.registry_object.register("python", "testapp.yaksh.python_code_evaluator.PythonCodeEvaluator")
-        self.assertEquals(self.registry_object.get_class("python"), class_name)
-
-    def tearDown(self):
-        self.registry_object = None
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/tests/test_java_evaluation.py b/testapp/tests/test_java_evaluation.py
deleted file mode 100644
index 92339e4..0000000
--- a/testapp/tests/test_java_evaluation.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import unittest
-import os
-from testapp.yaksh import code_evaluator as evaluator
-from testapp.yaksh.java_code_evaluator import JavaCodeEvaluator
-
-
-class JavaEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "java"
-        self.ref_code_path = "java_files/main_square.java"
-        self.in_dir = "/tmp"
-        self.test_case_data = []
-        evaluator.SERVER_TIMEOUT = 9
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in "
-                            "your code.").format(evaluator.SERVER_TIMEOUT)
-        self.test = None
-
-    def tearDown(self):
-        evaluator.SERVER_TIMEOUT = 2
-
-    def test_correct_answer(self):
-        user_answer = "class Test {\n\tint square_num(int a) {\n\treturn a*a;\n\t}\n}"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test,
-                                         self.language, user_answer,
-                                         self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_error(self):
-        user_answer = "class Test {\n\tint square_num(int a) {\n\treturn a*a"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test,
-                                         self.language, user_answer,
-                                         self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
- 
-        self.assertFalse(result.get("success"))
-        self.assertTrue("Error" in result.get("error"))
-
-    def test_infinite_loop(self):
-        user_answer = "class Test {\n\tint square_num(int a) {\n\t\twhile(0==0){\n\t\t}\n\t}\n}"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test,
-                                         self.language, user_answer,
-                                         self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
- 
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/tests/test_python_evaluation.py b/testapp/tests/test_python_evaluation.py
deleted file mode 100644
index ea01fa8..0000000
--- a/testapp/tests/test_python_evaluation.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import unittest
-import os
-from testapp.yaksh.python_code_evaluator import PythonCodeEvaluator
-from testapp.yaksh.settings import SERVER_TIMEOUT
-
-class PythonEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "Python"
-        self.test = None
-        self.test_case_data = [{"func_name": "add", 
-                                 "expected_answer": "5", 
-                                 "test_id": u'null', 
-                                 "pos_args": ["3", "2"], 
-                                 "kw_args": {}
-                                }]
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-
-    def test_correct_answer(self):
-        user_answer = "def add(a, b):\n\treturn a + b"""
-        get_class = PythonCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, ref_code_path=None, in_dir=None)
-        result = get_class.evaluate()
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_incorrect_answer(self):
-        user_answer = "def add(a, b):\n\treturn a - b"
-        test_case_data = [{"func_name": "add", 
-                                 "expected_answer": "5", 
-                                 "test_id": u'null', 
-                                 "pos_args": ["3", "2"], 
-                                 "kw_args": {}
-                                }]
-        get_class = PythonCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, ref_code_path=None, in_dir=None)
-        result = get_class.evaluate()
-        self.assertFalse(result.get("success"))
-        self.assertEqual(result.get("error"), "AssertionError  in: assert add(3, 2) == 5")
-
-    def test_infinite_loop(self):
-        user_answer = "def add(a, b):\n\twhile True:\n\t\tpass"""
-        test_case_data = [{"func_name": "add", 
-                                 "expected_answer": "5", 
-                                 "test_id": u'null', 
-                                 "pos_args": ["3", "2"], 
-                                 "kw_args": {}
-                                }]
-        get_class = PythonCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, ref_code_path=None, in_dir=None)
-        result = get_class.evaluate()
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/tests/test_scilab_evaluation.py b/testapp/tests/test_scilab_evaluation.py
deleted file mode 100644
index 4d05426..0000000
--- a/testapp/tests/test_scilab_evaluation.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-import os
-from testapp.yaksh.scilab_code_evaluator import ScilabCodeEvaluator
-from testapp.yaksh.settings import SERVER_TIMEOUT
-
-class ScilabEvaluationTestCases(unittest.TestCase):
-    def setUp(self):
-        self.language = "scilab"
-        self.ref_code_path = "scilab_files/test_add.sce"
-        self.in_dir = "/tmp"
-        self.test_case_data = []
-        self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-        self.test = None
-
-    def test_correct_answer(self):
-        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a+b;\nendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
-                                             self.language, user_answer,
-                                             self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_error(self):
-        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a+b;\ndis(\tendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
-                                             self.language, user_answer,
-                                             self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
- 
-        self.assertFalse(result.get("success"))
-        self.assertTrue("error" in result.get("error"))
-
-    def test_infinite_loop(self):
-        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a;\nwhile(1==1)\nend\nendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
-                                         self.language, user_answer,
-                                         self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), self.timeout_msg)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/testapp/urls.py b/testapp/urls.py
deleted file mode 100644
index 7022b0d..0000000
--- a/testapp/urls.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from django.conf.urls import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-from settings import URL_ROOT
-
-if URL_ROOT.startswith('/'):
-    URL_BASE = r'^%s/exam/'%URL_ROOT[1:]
-    ADMIN_BASE = r'^%s/admin/'%URL_ROOT[1:]
-else:
-    URL_BASE = r'^exam/'
-    ADMIN_BASE = r'^admin/'
-
-urlpatterns = patterns('',
-    url(URL_BASE, include('yaksh.urls')),
-    #url(r'^admin/', include(admin.site.urls)),
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    # Uncomment the next line to enable the admin:
-    url(ADMIN_BASE, include(admin.site.urls)),
-
-)
-
-urlpatterns += patterns('',
-    url(r'^taggit_autocomplete_modified/', include\
-                                        ('taggit_autocomplete_modified.urls')),
-)
diff --git a/testapp/yaksh/__init__.py b/testapp/yaksh/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/testapp/yaksh/__init__.py
+++ /dev/null
diff --git a/testapp/yaksh/management/__init__.py b/testapp/yaksh/management/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/testapp/yaksh/management/__init__.py
+++ /dev/null
diff --git a/testapp/yaksh/management/commands/__init__.py b/testapp/yaksh/management/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/testapp/yaksh/management/commands/__init__.py
+++ /dev/null
diff --git a/testapp/__init__.py b/yaksh/__init__.py
index e69de29..e69de29 100644
--- a/testapp/__init__.py
+++ b/yaksh/__init__.py
diff --git a/testapp/yaksh/admin.py b/yaksh/admin.py
index ed0afde..71dfb3b 100644
--- a/testapp/yaksh/admin.py
+++ b/yaksh/admin.py
@@ -1,4 +1,4 @@
-from testapp.yaksh.models import Question, Quiz, TestCase
+from yaksh.models import Question, Quiz, TestCase
 from django.contrib import admin
 
 admin.site.register(Question)
diff --git a/testapp/yaksh/bash_code_evaluator.py b/yaksh/bash_code_evaluator.py
index a468fd7..a468fd7 100644
--- a/testapp/yaksh/bash_code_evaluator.py
+++ b/yaksh/bash_code_evaluator.py
diff --git a/testapp/yaksh/bash_files/sample.args b/yaksh/bash_files/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/yaksh/bash_files/sample.args
+++ b/yaksh/bash_files/sample.args
diff --git a/testapp/yaksh/bash_files/sample.sh b/yaksh/bash_files/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/yaksh/bash_files/sample.sh
+++ b/yaksh/bash_files/sample.sh
diff --git a/testapp/yaksh/c_cpp_files/main.cpp b/yaksh/c_cpp_files/main.cpp
index ebe1f08..ebe1f08 100755
--- a/testapp/yaksh/c_cpp_files/main.cpp
+++ b/yaksh/c_cpp_files/main.cpp
diff --git a/testapp/yaksh/c_cpp_files/main2.c b/yaksh/c_cpp_files/main2.c
index ccd1768..ccd1768 100755
--- a/testapp/yaksh/c_cpp_files/main2.c
+++ b/yaksh/c_cpp_files/main2.c
diff --git a/testapp/yaksh/c_cpp_files/main_array_check.cpp b/yaksh/c_cpp_files/main_array_check.cpp
index ea34fdd..ea34fdd 100755
--- a/testapp/yaksh/c_cpp_files/main_array_check.cpp
+++ b/yaksh/c_cpp_files/main_array_check.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_array_check_all.cpp b/yaksh/c_cpp_files/main_array_check_all.cpp
index 140578e..140578e 100755
--- a/testapp/yaksh/c_cpp_files/main_array_check_all.cpp
+++ b/yaksh/c_cpp_files/main_array_check_all.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_array_sum.cpp b/yaksh/c_cpp_files/main_array_sum.cpp
index 55b2ebf..55b2ebf 100755
--- a/testapp/yaksh/c_cpp_files/main_array_sum.cpp
+++ b/yaksh/c_cpp_files/main_array_sum.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_blackJack.cpp b/yaksh/c_cpp_files/main_blackJack.cpp
index cc54e78..cc54e78 100755
--- a/testapp/yaksh/c_cpp_files/main_blackJack.cpp
+++ b/yaksh/c_cpp_files/main_blackJack.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_check_digit.cpp b/yaksh/c_cpp_files/main_check_digit.cpp
index d3bf3d6..d3bf3d6 100755
--- a/testapp/yaksh/c_cpp_files/main_check_digit.cpp
+++ b/yaksh/c_cpp_files/main_check_digit.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_count667.cpp b/yaksh/c_cpp_files/main_count667.cpp
index f146e8c..f146e8c 100755
--- a/testapp/yaksh/c_cpp_files/main_count667.cpp
+++ b/yaksh/c_cpp_files/main_count667.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_count7.cpp b/yaksh/c_cpp_files/main_count7.cpp
index 982e930..982e930 100755
--- a/testapp/yaksh/c_cpp_files/main_count7.cpp
+++ b/yaksh/c_cpp_files/main_count7.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_fact.cpp b/yaksh/c_cpp_files/main_fact.cpp
index a4ff230..a4ff230 100755
--- a/testapp/yaksh/c_cpp_files/main_fact.cpp
+++ b/yaksh/c_cpp_files/main_fact.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_greatest.cpp b/yaksh/c_cpp_files/main_greatest.cpp
index 6d0a7c2..6d0a7c2 100755
--- a/testapp/yaksh/c_cpp_files/main_greatest.cpp
+++ b/yaksh/c_cpp_files/main_greatest.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_hello_name.c b/yaksh/c_cpp_files/main_hello_name.c
index 71b83a2..71b83a2 100755
--- a/testapp/yaksh/c_cpp_files/main_hello_name.c
+++ b/yaksh/c_cpp_files/main_hello_name.c
diff --git a/testapp/yaksh/c_cpp_files/main_lessThan9.cpp b/yaksh/c_cpp_files/main_lessThan9.cpp
index 722b4bb..722b4bb 100755
--- a/testapp/yaksh/c_cpp_files/main_lessThan9.cpp
+++ b/yaksh/c_cpp_files/main_lessThan9.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_mean.cpp b/yaksh/c_cpp_files/main_mean.cpp
index 21a4b1a..21a4b1a 100755
--- a/testapp/yaksh/c_cpp_files/main_mean.cpp
+++ b/yaksh/c_cpp_files/main_mean.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_palindrome.cpp b/yaksh/c_cpp_files/main_palindrome.cpp
index 0e66928..0e66928 100755
--- a/testapp/yaksh/c_cpp_files/main_palindrome.cpp
+++ b/yaksh/c_cpp_files/main_palindrome.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_roundTo10.cpp b/yaksh/c_cpp_files/main_roundTo10.cpp
index 12c961d..12c961d 100755
--- a/testapp/yaksh/c_cpp_files/main_roundTo10.cpp
+++ b/yaksh/c_cpp_files/main_roundTo10.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_specialSum.cpp b/yaksh/c_cpp_files/main_specialSum.cpp
index d614536..d614536 100755
--- a/testapp/yaksh/c_cpp_files/main_specialSum.cpp
+++ b/yaksh/c_cpp_files/main_specialSum.cpp
diff --git a/testapp/yaksh/c_cpp_files/main_within.cpp b/yaksh/c_cpp_files/main_within.cpp
index 50f9ad0..50f9ad0 100755
--- a/testapp/yaksh/c_cpp_files/main_within.cpp
+++ b/yaksh/c_cpp_files/main_within.cpp
diff --git a/testapp/yaksh/code_evaluator.py b/yaksh/code_evaluator.py
index 381b2e8..381b2e8 100644
--- a/testapp/yaksh/code_evaluator.py
+++ b/yaksh/code_evaluator.py
diff --git a/testapp/yaksh/code_server.py b/yaksh/code_server.py
index 2593752..2593752 100755
--- a/testapp/yaksh/code_server.py
+++ b/yaksh/code_server.py
diff --git a/testapp/yaksh/cpp_code_evaluator.py b/yaksh/cpp_code_evaluator.py
index 7242884..7242884 100644
--- a/testapp/yaksh/cpp_code_evaluator.py
+++ b/yaksh/cpp_code_evaluator.py
diff --git a/testapp/templates/demo_settings.py b/yaksh/demo_templates/demo_settings.py
index ecc1fe3..4e12463 100644
--- a/testapp/templates/demo_settings.py
+++ b/yaksh/demo_templates/demo_settings.py
@@ -38,7 +38,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'testapp.exam',
+    'yaksh',
     'taggit',
 )
 
@@ -85,4 +85,4 @@ USE_TZ = False
 
 STATIC_URL = '/static/'
 
-AUTH_PROFILE_MODULE = 'exam.Profile'
+AUTH_PROFILE_MODULE = 'yaksh.Profile'
diff --git a/testapp/templates/demo_urls.py b/yaksh/demo_templates/demo_urls.py
index da8bc2b..d99e473 100644
--- a/testapp/templates/demo_urls.py
+++ b/yaksh/demo_templates/demo_urls.py
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^exam/', include('testapp.yaksh.urls')),
+    url(r'^exam/', include('yaksh.urls')),
 )
diff --git a/testapp/yaksh/docs/sample.args b/yaksh/docs/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/yaksh/docs/sample.args
+++ b/yaksh/docs/sample.args
diff --git a/testapp/yaksh/docs/sample.sh b/yaksh/docs/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/yaksh/docs/sample.sh
+++ b/yaksh/docs/sample.sh
diff --git a/testapp/yaksh/docs/sample_questions.py b/yaksh/docs/sample_questions.py
index 60f32cb..60f32cb 100644
--- a/testapp/yaksh/docs/sample_questions.py
+++ b/yaksh/docs/sample_questions.py
diff --git a/testapp/yaksh/docs/sample_questions.xml b/yaksh/docs/sample_questions.xml
index 53c76f8..53c76f8 100644
--- a/testapp/yaksh/docs/sample_questions.xml
+++ b/yaksh/docs/sample_questions.xml
diff --git a/testapp/fixtures/initial_fixtures.json b/yaksh/fixtures/initial_fixtures.json
index e16b09f..e16b09f 100644
--- a/testapp/fixtures/initial_fixtures.json
+++ b/yaksh/fixtures/initial_fixtures.json
diff --git a/testapp/yaksh/forms.py b/yaksh/forms.py
index 8878114..de40419 100644
--- a/testapp/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from testapp.yaksh.models import Profile, Quiz, Question, TestCase
+from yaksh.models import Profile, Quiz, Question, TestCase
 
 from django.contrib.auth import authenticate
 from django.contrib.auth.models import User
diff --git a/testapp/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index 4367259..4367259 100644
--- a/testapp/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
diff --git a/testapp/yaksh/java_files/main_array_sum.java b/yaksh/java_files/main_array_sum.java
index 5eae299..5eae299 100644
--- a/testapp/yaksh/java_files/main_array_sum.java
+++ b/yaksh/java_files/main_array_sum.java
diff --git a/testapp/yaksh/java_files/main_fact.java b/yaksh/java_files/main_fact.java
index 325dab6..325dab6 100644
--- a/testapp/yaksh/java_files/main_fact.java
+++ b/yaksh/java_files/main_fact.java
diff --git a/testapp/yaksh/java_files/main_great.java b/yaksh/java_files/main_great.java
index 4bfcb1f..4bfcb1f 100644
--- a/testapp/yaksh/java_files/main_great.java
+++ b/yaksh/java_files/main_great.java
diff --git a/testapp/yaksh/java_files/main_hello_name.java b/yaksh/java_files/main_hello_name.java
index 84bb282..84bb282 100644
--- a/testapp/yaksh/java_files/main_hello_name.java
+++ b/yaksh/java_files/main_hello_name.java
diff --git a/testapp/yaksh/java_files/main_lastDigit.java b/yaksh/java_files/main_lastDigit.java
index 05439e2..05439e2 100644
--- a/testapp/yaksh/java_files/main_lastDigit.java
+++ b/yaksh/java_files/main_lastDigit.java
diff --git a/testapp/yaksh/java_files/main_moreThan30.java b/yaksh/java_files/main_moreThan30.java
index 7da31cb..7da31cb 100644
--- a/testapp/yaksh/java_files/main_moreThan30.java
+++ b/yaksh/java_files/main_moreThan30.java
diff --git a/testapp/yaksh/java_files/main_palindrome.java b/yaksh/java_files/main_palindrome.java
index c0745f9..c0745f9 100644
--- a/testapp/yaksh/java_files/main_palindrome.java
+++ b/yaksh/java_files/main_palindrome.java
diff --git a/testapp/yaksh/java_files/main_square.java b/yaksh/java_files/main_square.java
index 5cb8c35..5cb8c35 100644
--- a/testapp/yaksh/java_files/main_square.java
+++ b/yaksh/java_files/main_square.java
diff --git a/testapp/yaksh/language_registry.py b/yaksh/language_registry.py
index 76a23d7..76a23d7 100644
--- a/testapp/yaksh/language_registry.py
+++ b/yaksh/language_registry.py
diff --git a/testapp/myauthentication/__init__.py b/yaksh/management/__init__.py
index e69de29..e69de29 100644
--- a/testapp/myauthentication/__init__.py
+++ b/yaksh/management/__init__.py
diff --git a/testapp/scripts/__init__.py b/yaksh/management/commands/__init__.py
index e69de29..e69de29 100644
--- a/testapp/scripts/__init__.py
+++ b/yaksh/management/commands/__init__.py
diff --git a/testapp/yaksh/management/commands/add_group.py b/yaksh/management/commands/add_group.py
index 03ef103..03ef103 100644
--- a/testapp/yaksh/management/commands/add_group.py
+++ b/yaksh/management/commands/add_group.py
diff --git a/testapp/yaksh/management/commands/dump_user_data.py b/yaksh/management/commands/dump_user_data.py
index 302728e..7deee03 100644
--- a/testapp/yaksh/management/commands/dump_user_data.py
+++ b/yaksh/management/commands/dump_user_data.py
@@ -5,8 +5,8 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from testapp.yaksh.views import get_user_data
-from testapp.yaksh.models import User
+from yaksh.views import get_user_data
+from yaksh.models import User
 
 data_template = Template('''\
 ===============================================================================
diff --git a/testapp/yaksh/management/commands/load_exam.py b/yaksh/management/commands/load_exam.py
index 84bf762..b354fbd 100644
--- a/testapp/yaksh/management/commands/load_exam.py
+++ b/yaksh/management/commands/load_exam.py
@@ -5,7 +5,7 @@ from os.path import basename
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from testapp.yaksh.models import Question, Quiz
+from yaksh.models import Question, Quiz
 
 def clear_exam():
     """Deactivate all questions from the database."""
diff --git a/testapp/yaksh/management/commands/load_questions_xml.py b/yaksh/management/commands/load_questions_xml.py
index 0109e40..02714ea 100644
--- a/testapp/yaksh/management/commands/load_questions_xml.py
+++ b/yaksh/management/commands/load_questions_xml.py
@@ -8,7 +8,7 @@ import re
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from testapp.yaksh.models import Question
+from yaksh.models import Question
 
 def decode_html(html_str):
     """Un-escape or decode HTML strings to more usable Python strings.
diff --git a/testapp/yaksh/management/commands/results2csv.py b/yaksh/management/commands/results2csv.py
index daf6eb9..2644354 100644
--- a/testapp/yaksh/management/commands/results2csv.py
+++ b/yaksh/management/commands/results2csv.py
@@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from testapp.yaksh.models import Quiz, QuestionPaper
+from yaksh.models import Quiz, QuestionPaper
 
 result_template = Template('''\
 "name","username","rollno","email","answered","total","attempts","position",\
diff --git a/testapp/yaksh/models.py b/yaksh/models.py
index 62ac9bc..62ac9bc 100644
--- a/testapp/yaksh/models.py
+++ b/yaksh/models.py
diff --git a/testapp/yaksh/output/README.txt b/yaksh/output/README.txt
index 3163ed4..3163ed4 100644
--- a/testapp/yaksh/output/README.txt
+++ b/yaksh/output/README.txt
diff --git a/testapp/yaksh/python_code_evaluator.py b/yaksh/python_code_evaluator.py
index 0c473cf..0c473cf 100644
--- a/testapp/yaksh/python_code_evaluator.py
+++ b/yaksh/python_code_evaluator.py
diff --git a/testapp/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 392cd45..392cd45 100644
--- a/testapp/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
diff --git a/testapp/yaksh/scilab_files/test_add.sce b/yaksh/scilab_files/test_add.sce
index a317cdb..a317cdb 100644
--- a/testapp/yaksh/scilab_files/test_add.sce
+++ b/yaksh/scilab_files/test_add.sce
diff --git a/testapp/tests/__init__.py b/yaksh/scripts/__init__.py
index e69de29..e69de29 100644
--- a/testapp/tests/__init__.py
+++ b/yaksh/scripts/__init__.py
diff --git a/testapp/scripts/project_detail.py b/yaksh/scripts/project_detail.py
index 583e9f4..583e9f4 100644
--- a/testapp/scripts/project_detail.py
+++ b/yaksh/scripts/project_detail.py
diff --git a/testapp/scripts/yaksh.py b/yaksh/scripts/yaksh.py
index 8b3e8b7..4360d1b 100644
--- a/testapp/scripts/yaksh.py
+++ b/yaksh/scripts/yaksh.py
@@ -15,7 +15,7 @@ from project_detail import NAME, PATH
 CUR_DIR = os.getcwd()
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
 PARENT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
-TEMPLATE_DIR = path.join(PARENT_DIR, 'templates')
+TEMPLATE_DIR = path.join(PARENT_DIR, 'demo_templates')
 
 def main():
     #Parse command-line to obtain the arguments and/or options
@@ -111,7 +111,7 @@ def run_demo(project_name, top_dir):
 
 def run_server():
     try:
-        from testapp.exam import code_server
+        from yaksh import code_server
         code_server.main()
     except Exception as e:
         print("Error: {0}\nExiting Vimarsh code server".format(e))
diff --git a/testapp/yaksh/settings.py b/yaksh/settings.py
index 4b1828e..4b1828e 100644
--- a/testapp/yaksh/settings.py
+++ b/yaksh/settings.py
diff --git a/testapp/yaksh/static/yaksh_app/css/autotaggit.css b/yaksh/static/yaksh_app/css/autotaggit.css
index ed856ce..ed856ce 100644
--- a/testapp/yaksh/static/yaksh_app/css/autotaggit.css
+++ b/yaksh/static/yaksh_app/css/autotaggit.css
diff --git a/testapp/yaksh/static/yaksh_app/css/base.css b/yaksh/static/yaksh_app/css/base.css
index 3570098..3570098 100644
--- a/testapp/yaksh/static/yaksh_app/css/base.css
+++ b/yaksh/static/yaksh_app/css/base.css
diff --git a/testapp/yaksh/static/yaksh_app/css/gradeuser.css b/yaksh/static/yaksh_app/css/gradeuser.css
index 07b1079..07b1079 100644
--- a/testapp/yaksh/static/yaksh_app/css/gradeuser.css
+++ b/yaksh/static/yaksh_app/css/gradeuser.css
diff --git a/testapp/yaksh/static/yaksh_app/css/login.css b/yaksh/static/yaksh_app/css/login.css
index a10cbaa..a10cbaa 100644
--- a/testapp/yaksh/static/yaksh_app/css/login.css
+++ b/yaksh/static/yaksh_app/css/login.css
diff --git a/testapp/yaksh/static/yaksh_app/css/monitor.css b/yaksh/static/yaksh_app/css/monitor.css
index b16c8b3..b16c8b3 100644
--- a/testapp/yaksh/static/yaksh_app/css/monitor.css
+++ b/yaksh/static/yaksh_app/css/monitor.css
diff --git a/testapp/yaksh/static/yaksh_app/css/question.css b/yaksh/static/yaksh_app/css/question.css
index 4bf5913..4bf5913 100644
--- a/testapp/yaksh/static/yaksh_app/css/question.css
+++ b/yaksh/static/yaksh_app/css/question.css
diff --git a/testapp/yaksh/static/yaksh_app/css/question_paper_creation.css b/yaksh/static/yaksh_app/css/question_paper_creation.css
index c915320..c915320 100644
--- a/testapp/yaksh/static/yaksh_app/css/question_paper_creation.css
+++ b/yaksh/static/yaksh_app/css/question_paper_creation.css
diff --git a/testapp/yaksh/static/yaksh_app/css/question_quiz.css b/yaksh/static/yaksh_app/css/question_quiz.css
index ee249d4..ee249d4 100644
--- a/testapp/yaksh/static/yaksh_app/css/question_quiz.css
+++ b/yaksh/static/yaksh_app/css/question_quiz.css
diff --git a/testapp/yaksh/static/yaksh_app/css/showusers.css b/yaksh/static/yaksh_app/css/showusers.css
index 66a3746..66a3746 100644
--- a/testapp/yaksh/static/yaksh_app/css/showusers.css
+++ b/yaksh/static/yaksh_app/css/showusers.css
diff --git a/testapp/yaksh/static/yaksh_app/js/add_question.js b/yaksh/static/yaksh_app/js/add_question.js
index 946c139..946c139 100644
--- a/testapp/yaksh/static/yaksh_app/js/add_question.js
+++ b/yaksh/static/yaksh_app/js/add_question.js
diff --git a/testapp/yaksh/static/yaksh_app/js/add_questionpaper.js b/yaksh/static/yaksh_app/js/add_questionpaper.js
index 6185dd5..6185dd5 100644
--- a/testapp/yaksh/static/yaksh_app/js/add_questionpaper.js
+++ b/yaksh/static/yaksh_app/js/add_questionpaper.js
diff --git a/testapp/yaksh/static/yaksh_app/js/add_quiz.js b/yaksh/static/yaksh_app/js/add_quiz.js
index 184881c..184881c 100644
--- a/testapp/yaksh/static/yaksh_app/js/add_quiz.js
+++ b/yaksh/static/yaksh_app/js/add_quiz.js
diff --git a/testapp/yaksh/static/yaksh_app/js/bootstrap-modal.js b/yaksh/static/yaksh_app/js/bootstrap-modal.js
index b328217..b328217 100644
--- a/testapp/yaksh/static/yaksh_app/js/bootstrap-modal.js
+++ b/yaksh/static/yaksh_app/js/bootstrap-modal.js
diff --git a/testapp/yaksh/static/yaksh_app/js/bootstrap-tabs.js b/yaksh/static/yaksh_app/js/bootstrap-tabs.js
index a3c7ee1..a3c7ee1 100644
--- a/testapp/yaksh/static/yaksh_app/js/bootstrap-tabs.js
+++ b/yaksh/static/yaksh_app/js/bootstrap-tabs.js
diff --git a/testapp/yaksh/static/yaksh_app/js/edit_question.js b/yaksh/static/yaksh_app/js/edit_question.js
index 7a0f56d..7a0f56d 100644
--- a/testapp/yaksh/static/yaksh_app/js/edit_question.js
+++ b/yaksh/static/yaksh_app/js/edit_question.js
diff --git a/testapp/yaksh/static/yaksh_app/js/edit_quiz.js b/yaksh/static/yaksh_app/js/edit_quiz.js
index ce6dac7..ce6dac7 100644
--- a/testapp/yaksh/static/yaksh_app/js/edit_quiz.js
+++ b/yaksh/static/yaksh_app/js/edit_quiz.js
diff --git a/testapp/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js b/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js
index 48a88b8..48a88b8 100644
--- a/testapp/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js
+++ b/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js
diff --git a/testapp/yaksh/static/yaksh_app/js/min.js b/yaksh/static/yaksh_app/js/min.js
index b1ae21d..b1ae21d 100644
--- a/testapp/yaksh/static/yaksh_app/js/min.js
+++ b/yaksh/static/yaksh_app/js/min.js
diff --git a/testapp/yaksh/static/yaksh_app/js/question.js b/yaksh/static/yaksh_app/js/question.js
index 75baf76..75baf76 100644
--- a/testapp/yaksh/static/yaksh_app/js/question.js
+++ b/yaksh/static/yaksh_app/js/question.js
diff --git a/testapp/yaksh/static/yaksh_app/js/question_filter.js b/yaksh/static/yaksh_app/js/question_filter.js
index 065b06b..065b06b 100644
--- a/testapp/yaksh/static/yaksh_app/js/question_filter.js
+++ b/yaksh/static/yaksh_app/js/question_filter.js
diff --git a/testapp/yaksh/static/yaksh_app/js/question_paper_creation.js b/yaksh/static/yaksh_app/js/question_paper_creation.js
index a144540..a144540 100644
--- a/testapp/yaksh/static/yaksh_app/js/question_paper_creation.js
+++ b/yaksh/static/yaksh_app/js/question_paper_creation.js
diff --git a/testapp/yaksh/static/yaksh_app/js/show_question.js b/yaksh/static/yaksh_app/js/show_question.js
index e3ed1cc..e3ed1cc 100644
--- a/testapp/yaksh/static/yaksh_app/js/show_question.js
+++ b/yaksh/static/yaksh_app/js/show_question.js
diff --git a/testapp/yaksh/static/yaksh_app/js/show_quiz.js b/yaksh/static/yaksh_app/js/show_quiz.js
index c58feaa..c58feaa 100644
--- a/testapp/yaksh/static/yaksh_app/js/show_quiz.js
+++ b/yaksh/static/yaksh_app/js/show_quiz.js
diff --git a/testapp/yaksh/templates/404.html b/yaksh/templates/404.html
index 7d33dd3..7d33dd3 100644
--- a/testapp/yaksh/templates/404.html
+++ b/yaksh/templates/404.html
diff --git a/testapp/yaksh/templates/500.html b/yaksh/templates/500.html
index d02721f..d02721f 100644
--- a/testapp/yaksh/templates/500.html
+++ b/yaksh/templates/500.html
diff --git a/testapp/yaksh/templates/base.html b/yaksh/templates/base.html
index 5284a77..5284a77 100644
--- a/testapp/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
diff --git a/testapp/yaksh/templates/manage.html b/yaksh/templates/manage.html
index ca2ac65..ca2ac65 100644
--- a/testapp/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
diff --git a/testapp/yaksh/templates/user.html b/yaksh/templates/user.html
index 00151d2..00151d2 100644
--- a/testapp/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
diff --git a/testapp/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index b896081..b896081 100644
--- a/testapp/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
diff --git a/testapp/yaksh/templates/yaksh/add_questionpaper.html b/yaksh/templates/yaksh/add_questionpaper.html
index eaa96bc..eaa96bc 100644
--- a/testapp/yaksh/templates/yaksh/add_questionpaper.html
+++ b/yaksh/templates/yaksh/add_questionpaper.html
diff --git a/testapp/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index e78023d..e78023d 100644
--- a/testapp/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
diff --git a/testapp/yaksh/templates/yaksh/ajax_marks.html b/yaksh/templates/yaksh/ajax_marks.html
index 716bb88..716bb88 100644
--- a/testapp/yaksh/templates/yaksh/ajax_marks.html
+++ b/yaksh/templates/yaksh/ajax_marks.html
diff --git a/testapp/yaksh/templates/yaksh/ajax_question_filter.html b/yaksh/templates/yaksh/ajax_question_filter.html
index 11bf660..11bf660 100644
--- a/testapp/yaksh/templates/yaksh/ajax_question_filter.html
+++ b/yaksh/templates/yaksh/ajax_question_filter.html
diff --git a/testapp/yaksh/templates/yaksh/ajax_questions.html b/yaksh/templates/yaksh/ajax_questions.html
index e343f9b..e343f9b 100644
--- a/testapp/yaksh/templates/yaksh/ajax_questions.html
+++ b/yaksh/templates/yaksh/ajax_questions.html
diff --git a/testapp/yaksh/templates/yaksh/automatic_questionpaper.html b/yaksh/templates/yaksh/automatic_questionpaper.html
index b9a4ae0..b9a4ae0 100644
--- a/testapp/yaksh/templates/yaksh/automatic_questionpaper.html
+++ b/yaksh/templates/yaksh/automatic_questionpaper.html
diff --git a/testapp/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 08abe76..08abe76 100644
--- a/testapp/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
diff --git a/testapp/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 2aa169b..2aa169b 100644
--- a/testapp/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
diff --git a/testapp/yaksh/templates/yaksh/edit_question.html b/yaksh/templates/yaksh/edit_question.html
index 9a66250..9a66250 100644
--- a/testapp/yaksh/templates/yaksh/edit_question.html
+++ b/yaksh/templates/yaksh/edit_question.html
diff --git a/testapp/yaksh/templates/yaksh/edit_quiz.html b/yaksh/templates/yaksh/edit_quiz.html
index fb7df93..fb7df93 100644
--- a/testapp/yaksh/templates/yaksh/edit_quiz.html
+++ b/yaksh/templates/yaksh/edit_quiz.html
diff --git a/testapp/yaksh/templates/yaksh/editquestionpaper.html b/yaksh/templates/yaksh/editquestionpaper.html
index 2b7b835..2b7b835 100644
--- a/testapp/yaksh/templates/yaksh/editquestionpaper.html
+++ b/yaksh/templates/yaksh/editquestionpaper.html
diff --git a/testapp/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 8c094a7..8c094a7 100644
--- a/testapp/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
diff --git a/testapp/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html
index 9c5c14d..9c5c14d 100644
--- a/testapp/yaksh/templates/yaksh/intro.html
+++ b/yaksh/templates/yaksh/intro.html
diff --git a/testapp/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index dfeac1e..dfeac1e 100644
--- a/testapp/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
diff --git a/testapp/yaksh/templates/yaksh/manual_questionpaper.html b/yaksh/templates/yaksh/manual_questionpaper.html
index 86bfd67..86bfd67 100644
--- a/testapp/yaksh/templates/yaksh/manual_questionpaper.html
+++ b/yaksh/templates/yaksh/manual_questionpaper.html
diff --git a/testapp/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 52695cb..52695cb 100644
--- a/testapp/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
diff --git a/testapp/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index e532513..e532513 100644
--- a/testapp/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
diff --git a/testapp/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index 91bce64..91bce64 100644
--- a/testapp/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
diff --git a/testapp/yaksh/templates/yaksh/quizlist.html b/yaksh/templates/yaksh/quizlist.html
index 9b1fd73..9b1fd73 100644
--- a/testapp/yaksh/templates/yaksh/quizlist.html
+++ b/yaksh/templates/yaksh/quizlist.html
diff --git a/testapp/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index fbd50ce..fbd50ce 100644
--- a/testapp/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
diff --git a/testapp/yaksh/templates/yaksh/register.html b/yaksh/templates/yaksh/register.html
index 5ff79cc..5ff79cc 100644
--- a/testapp/yaksh/templates/yaksh/register.html
+++ b/yaksh/templates/yaksh/register.html
diff --git a/testapp/yaksh/templates/yaksh/results_user.html b/yaksh/templates/yaksh/results_user.html
index 0f35c0d..0f35c0d 100644
--- a/testapp/yaksh/templates/yaksh/results_user.html
+++ b/yaksh/templates/yaksh/results_user.html
diff --git a/testapp/yaksh/templates/yaksh/show_quiz.html b/yaksh/templates/yaksh/show_quiz.html
index 2cd4e11..2cd4e11 100644
--- a/testapp/yaksh/templates/yaksh/show_quiz.html
+++ b/yaksh/templates/yaksh/show_quiz.html
diff --git a/testapp/yaksh/templates/yaksh/showquestionpapers.html b/yaksh/templates/yaksh/showquestionpapers.html
index e705ce7..e705ce7 100644
--- a/testapp/yaksh/templates/yaksh/showquestionpapers.html
+++ b/yaksh/templates/yaksh/showquestionpapers.html
diff --git a/testapp/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index 6222d6d..6222d6d 100644
--- a/testapp/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
diff --git a/testapp/yaksh/templates/yaksh/showusers.html b/yaksh/templates/yaksh/showusers.html
index ae91076..ae91076 100644
--- a/testapp/yaksh/templates/yaksh/showusers.html
+++ b/yaksh/templates/yaksh/showusers.html
diff --git a/testapp/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 61a3a97..61a3a97 100644
--- a/testapp/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
diff --git a/testapp/yaksh/tests.py b/yaksh/tests.py
index f1587b7..77ac56f 100644
--- a/testapp/yaksh/tests.py
+++ b/yaksh/tests.py
@@ -1,5 +1,5 @@
 from django.utils import unittest
-from testapp.yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\
+from yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\
     QuestionSet, AnswerPaper, Answer, TestCase
 import datetime, json
 
diff --git a/testapp/yaksh/urls.py b/yaksh/urls.py
index 11e5965..a9f7a98 100644
--- a/testapp/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 
-urlpatterns = patterns('testapp.yaksh.views',
+urlpatterns = patterns('yaksh.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
     url(r'^quizzes/$', 'quizlist_user'),
diff --git a/testapp/yaksh/views.py b/yaksh/views.py
index d4476b7..41ce1bb 100644
--- a/testapp/yaksh/views.py
+++ b/yaksh/views.py
@@ -16,14 +16,14 @@ from taggit.models import Tag
 from itertools import chain
 import json
 # Local imports.
-from testapp.yaksh.models import Quiz, Question, QuestionPaper, QuestionSet
-from testapp.yaksh.models import Profile, Answer, AnswerPaper, User, TestCase
-from testapp.yaksh.forms import UserRegisterForm, UserLoginForm, QuizForm,\
+from yaksh.models import Quiz, Question, QuestionPaper, QuestionSet
+from yaksh.models import Profile, Answer, AnswerPaper, User, TestCase
+from yaksh.forms import UserRegisterForm, UserLoginForm, QuizForm,\
                 QuestionForm, RandomQuestionForm, TestCaseFormSet,\
                 QuestionFilterForm
-from testapp.yaksh.xmlrpc_clients import code_server
+from yaksh.xmlrpc_clients import code_server
 from settings import URL_ROOT
-from testapp.yaksh.models import AssignmentUpload
+from yaksh.models import AssignmentUpload
 
 # The directory where user data can be saved.
 OUTPUT_DIR = abspath(join(dirname(__file__), 'output'))
diff --git a/testapp/yaksh/xmlrpc_clients.py b/yaksh/xmlrpc_clients.py
index 3a3c0c6..3a3c0c6 100644
--- a/testapp/yaksh/xmlrpc_clients.py
+++ b/yaksh/xmlrpc_clients.py