127 files changed, 156 insertions, 156 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 762b21a..06a9b7d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,8 +6,8 @@ exclude testapp/urls.py
 exclude testapp/test_server.py
 exclude testapp/manage.py
 recursive-exclude testapp/myauthentication *
-recursive-include testapp/yaksh_app/static *
-recursive-include testapp/yaksh_app/templates *
-recursive-include testapp/yaksh_app/management *
-recursive-include testapp/yaksh_app/output *
-recursive-include testapp/yaksh_app/fixtures *
+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 *
diff --git a/README.md b/README.md
index be354e2..c4eb503 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@ Quick Start
 
 #### Installation
 
-1. Install the yaksh_app
+1. Install the yaksh
     
-        pip install yaksh_app
+        pip install yaksh
 
 1. In the terminal run
         
@@ -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_app/code_server.py
+        $ sudo python testapp/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_app/code_server.py
+      $ sudo python testapp/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 3d57c3b..6ec9437 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_app',
+    'testapp.yaksh',
     'taggit',
 )
 
@@ -68,7 +68,7 @@ DATABASES = {
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
 
-AUTH_PROFILE_MODULE = 'yaksh_app.Profile'
+AUTH_PROFILE_MODULE = 'yaksh.Profile'
 
 LANGUAGE_CODE = 'en-us'
 
diff --git a/online_test/urls.py b/online_test/urls.py
index 8a61db1..aa97523 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_app.urls')),
+    url(r'^exam/', include('testapp.yaksh.urls')),
 )
diff --git a/setup.py b/setup.py
index a9b23c5..0010fd4 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
     license='BSD License',
     entry_points = {
             'console_scripts': [
-                'vimarsh = testapp.scripts.vimarsh:main',
+                'yaksh = testapp.scripts.yaksh:main',
             ],
     },
     description='A django app to conduct online tests.',
diff --git a/testapp/templates/demo_urls.py b/testapp/templates/demo_urls.py
index 4308eba..da8bc2b 100644
--- a/testapp/templates/demo_urls.py
+++ b/testapp/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_app.urls')),
+    url(r'^exam/', include('testapp.yaksh.urls')),
 )
diff --git a/testapp/tests/test_bash_evaluation.py b/testapp/tests/test_bash_evaluation.py
index 924c560..4f7e4b6 100644
--- a/testapp/tests/test_bash_evaluation.py
+++ b/testapp/tests/test_bash_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.yaksh_app.bash_code_evaluator import BashCodeEvaluator
-from testapp.yaksh_app.settings import SERVER_TIMEOUT
+from testapp.yaksh.bash_code_evaluator import BashCodeEvaluator
+from testapp.yaksh.settings import SERVER_TIMEOUT
 
 class BashEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_c_cpp_evaluation.py b/testapp/tests/test_c_cpp_evaluation.py
index 3d7f09d..9cbc013 100644
--- a/testapp/tests/test_c_cpp_evaluation.py
+++ b/testapp/tests/test_c_cpp_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.yaksh_app.cpp_code_evaluator import CppCodeEvaluator
-from testapp.yaksh_app.settings import SERVER_TIMEOUT
+from testapp.yaksh.cpp_code_evaluator import CppCodeEvaluator
+from testapp.yaksh.settings import SERVER_TIMEOUT
 
 class CEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_code_evaluation.py b/testapp/tests/test_code_evaluation.py
index 9f0885f..10b88b5 100644
--- a/testapp/tests/test_code_evaluation.py
+++ b/testapp/tests/test_code_evaluation.py
@@ -1,8 +1,8 @@
 import unittest
 import os
-from testapp.yaksh_app import python_code_evaluator
-from testapp.yaksh_app.language_registry import _LanguageRegistry, set_registry, get_registry
-from testapp.yaksh_app.settings import SERVER_TIMEOUT
+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):
@@ -13,7 +13,7 @@ class RegistryTestCase(unittest.TestCase):
 
     def test_set_register(self):
         class_name = getattr(python_code_evaluator, 'PythonCodeEvaluator')
-        self.registry_object.register("python", "testapp.yaksh_app.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):
diff --git a/testapp/tests/test_java_evaluation.py b/testapp/tests/test_java_evaluation.py
index 8e1fdeb..92339e4 100644
--- a/testapp/tests/test_java_evaluation.py
+++ b/testapp/tests/test_java_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.yaksh_app import code_evaluator as evaluator
-from testapp.yaksh_app.java_code_evaluator import JavaCodeEvaluator
+from testapp.yaksh import code_evaluator as evaluator
+from testapp.yaksh.java_code_evaluator import JavaCodeEvaluator
 
 
 class JavaEvaluationTestCases(unittest.TestCase):
diff --git a/testapp/tests/test_python_evaluation.py b/testapp/tests/test_python_evaluation.py
index 7039b75..ea01fa8 100644
--- a/testapp/tests/test_python_evaluation.py
+++ b/testapp/tests/test_python_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.yaksh_app.python_code_evaluator import PythonCodeEvaluator
-from testapp.yaksh_app.settings import SERVER_TIMEOUT
+from testapp.yaksh.python_code_evaluator import PythonCodeEvaluator
+from testapp.yaksh.settings import SERVER_TIMEOUT
 
 class PythonEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/tests/test_scilab_evaluation.py b/testapp/tests/test_scilab_evaluation.py
index 346060a..4d05426 100644
--- a/testapp/tests/test_scilab_evaluation.py
+++ b/testapp/tests/test_scilab_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from testapp.yaksh_app.scilab_code_evaluator import ScilabCodeEvaluator
-from testapp.yaksh_app.settings import SERVER_TIMEOUT
+from testapp.yaksh.scilab_code_evaluator import ScilabCodeEvaluator
+from testapp.yaksh.settings import SERVER_TIMEOUT
 
 class ScilabEvaluationTestCases(unittest.TestCase):
     def setUp(self):
diff --git a/testapp/urls.py b/testapp/urls.py
index 4547232..7022b0d 100644
--- a/testapp/urls.py
+++ b/testapp/urls.py
@@ -14,7 +14,7 @@ else:
     ADMIN_BASE = r'^admin/'
 
 urlpatterns = patterns('',
-    url(URL_BASE, include('yaksh_app.urls')),
+    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')),
diff --git a/testapp/yaksh_app/__init__.py b/testapp/yaksh/__init__.py
index e69de29..e69de29 100644
--- a/testapp/yaksh_app/__init__.py
+++ b/testapp/yaksh/__init__.py
diff --git a/testapp/yaksh_app/admin.py b/testapp/yaksh/admin.py
index e0a7741..ed0afde 100644
--- a/testapp/yaksh_app/admin.py
+++ b/testapp/yaksh/admin.py
@@ -1,4 +1,4 @@
-from testapp.yaksh_app.models import Question, Quiz, TestCase
+from testapp.yaksh.models import Question, Quiz, TestCase
 from django.contrib import admin
 
 admin.site.register(Question)
diff --git a/testapp/yaksh_app/bash_code_evaluator.py b/testapp/yaksh/bash_code_evaluator.py
index a468fd7..a468fd7 100644
--- a/testapp/yaksh_app/bash_code_evaluator.py
+++ b/testapp/yaksh/bash_code_evaluator.py
diff --git a/testapp/yaksh_app/bash_files/sample.args b/testapp/yaksh/bash_files/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/yaksh_app/bash_files/sample.args
+++ b/testapp/yaksh/bash_files/sample.args
diff --git a/testapp/yaksh_app/bash_files/sample.sh b/testapp/yaksh/bash_files/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/yaksh_app/bash_files/sample.sh
+++ b/testapp/yaksh/bash_files/sample.sh
diff --git a/testapp/yaksh_app/c_cpp_files/main.cpp b/testapp/yaksh/c_cpp_files/main.cpp
index ebe1f08..ebe1f08 100755
--- a/testapp/yaksh_app/c_cpp_files/main.cpp
+++ b/testapp/yaksh/c_cpp_files/main.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main2.c b/testapp/yaksh/c_cpp_files/main2.c
index ccd1768..ccd1768 100755
--- a/testapp/yaksh_app/c_cpp_files/main2.c
+++ b/testapp/yaksh/c_cpp_files/main2.c
diff --git a/testapp/yaksh_app/c_cpp_files/main_array_check.cpp b/testapp/yaksh/c_cpp_files/main_array_check.cpp
index ea34fdd..ea34fdd 100755
--- a/testapp/yaksh_app/c_cpp_files/main_array_check.cpp
+++ b/testapp/yaksh/c_cpp_files/main_array_check.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_array_check_all.cpp b/testapp/yaksh/c_cpp_files/main_array_check_all.cpp
index 140578e..140578e 100755
--- a/testapp/yaksh_app/c_cpp_files/main_array_check_all.cpp
+++ b/testapp/yaksh/c_cpp_files/main_array_check_all.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_array_sum.cpp b/testapp/yaksh/c_cpp_files/main_array_sum.cpp
index 55b2ebf..55b2ebf 100755
--- a/testapp/yaksh_app/c_cpp_files/main_array_sum.cpp
+++ b/testapp/yaksh/c_cpp_files/main_array_sum.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_blackJack.cpp b/testapp/yaksh/c_cpp_files/main_blackJack.cpp
index cc54e78..cc54e78 100755
--- a/testapp/yaksh_app/c_cpp_files/main_blackJack.cpp
+++ b/testapp/yaksh/c_cpp_files/main_blackJack.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_check_digit.cpp b/testapp/yaksh/c_cpp_files/main_check_digit.cpp
index d3bf3d6..d3bf3d6 100755
--- a/testapp/yaksh_app/c_cpp_files/main_check_digit.cpp
+++ b/testapp/yaksh/c_cpp_files/main_check_digit.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_count667.cpp b/testapp/yaksh/c_cpp_files/main_count667.cpp
index f146e8c..f146e8c 100755
--- a/testapp/yaksh_app/c_cpp_files/main_count667.cpp
+++ b/testapp/yaksh/c_cpp_files/main_count667.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_count7.cpp b/testapp/yaksh/c_cpp_files/main_count7.cpp
index 982e930..982e930 100755
--- a/testapp/yaksh_app/c_cpp_files/main_count7.cpp
+++ b/testapp/yaksh/c_cpp_files/main_count7.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_fact.cpp b/testapp/yaksh/c_cpp_files/main_fact.cpp
index a4ff230..a4ff230 100755
--- a/testapp/yaksh_app/c_cpp_files/main_fact.cpp
+++ b/testapp/yaksh/c_cpp_files/main_fact.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_greatest.cpp b/testapp/yaksh/c_cpp_files/main_greatest.cpp
index 6d0a7c2..6d0a7c2 100755
--- a/testapp/yaksh_app/c_cpp_files/main_greatest.cpp
+++ b/testapp/yaksh/c_cpp_files/main_greatest.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_hello_name.c b/testapp/yaksh/c_cpp_files/main_hello_name.c
index 71b83a2..71b83a2 100755
--- a/testapp/yaksh_app/c_cpp_files/main_hello_name.c
+++ b/testapp/yaksh/c_cpp_files/main_hello_name.c
diff --git a/testapp/yaksh_app/c_cpp_files/main_lessThan9.cpp b/testapp/yaksh/c_cpp_files/main_lessThan9.cpp
index 722b4bb..722b4bb 100755
--- a/testapp/yaksh_app/c_cpp_files/main_lessThan9.cpp
+++ b/testapp/yaksh/c_cpp_files/main_lessThan9.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_mean.cpp b/testapp/yaksh/c_cpp_files/main_mean.cpp
index 21a4b1a..21a4b1a 100755
--- a/testapp/yaksh_app/c_cpp_files/main_mean.cpp
+++ b/testapp/yaksh/c_cpp_files/main_mean.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_palindrome.cpp b/testapp/yaksh/c_cpp_files/main_palindrome.cpp
index 0e66928..0e66928 100755
--- a/testapp/yaksh_app/c_cpp_files/main_palindrome.cpp
+++ b/testapp/yaksh/c_cpp_files/main_palindrome.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_roundTo10.cpp b/testapp/yaksh/c_cpp_files/main_roundTo10.cpp
index 12c961d..12c961d 100755
--- a/testapp/yaksh_app/c_cpp_files/main_roundTo10.cpp
+++ b/testapp/yaksh/c_cpp_files/main_roundTo10.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_specialSum.cpp b/testapp/yaksh/c_cpp_files/main_specialSum.cpp
index d614536..d614536 100755
--- a/testapp/yaksh_app/c_cpp_files/main_specialSum.cpp
+++ b/testapp/yaksh/c_cpp_files/main_specialSum.cpp
diff --git a/testapp/yaksh_app/c_cpp_files/main_within.cpp b/testapp/yaksh/c_cpp_files/main_within.cpp
index 50f9ad0..50f9ad0 100755
--- a/testapp/yaksh_app/c_cpp_files/main_within.cpp
+++ b/testapp/yaksh/c_cpp_files/main_within.cpp
diff --git a/testapp/yaksh_app/code_evaluator.py b/testapp/yaksh/code_evaluator.py
index 381b2e8..381b2e8 100644
--- a/testapp/yaksh_app/code_evaluator.py
+++ b/testapp/yaksh/code_evaluator.py
diff --git a/testapp/yaksh_app/code_server.py b/testapp/yaksh/code_server.py
index 2593752..2593752 100755
--- a/testapp/yaksh_app/code_server.py
+++ b/testapp/yaksh/code_server.py
diff --git a/testapp/yaksh_app/cpp_code_evaluator.py b/testapp/yaksh/cpp_code_evaluator.py
index 7242884..7242884 100644
--- a/testapp/yaksh_app/cpp_code_evaluator.py
+++ b/testapp/yaksh/cpp_code_evaluator.py
diff --git a/testapp/yaksh_app/docs/sample.args b/testapp/yaksh/docs/sample.args
index 4d9f00d..4d9f00d 100644
--- a/testapp/yaksh_app/docs/sample.args
+++ b/testapp/yaksh/docs/sample.args
diff --git a/testapp/yaksh_app/docs/sample.sh b/testapp/yaksh/docs/sample.sh
index e935cb3..e935cb3 100755
--- a/testapp/yaksh_app/docs/sample.sh
+++ b/testapp/yaksh/docs/sample.sh
diff --git a/testapp/yaksh_app/docs/sample_questions.py b/testapp/yaksh/docs/sample_questions.py
index 60f32cb..60f32cb 100644
--- a/testapp/yaksh_app/docs/sample_questions.py
+++ b/testapp/yaksh/docs/sample_questions.py
diff --git a/testapp/yaksh_app/docs/sample_questions.xml b/testapp/yaksh/docs/sample_questions.xml
index 53c76f8..53c76f8 100644
--- a/testapp/yaksh_app/docs/sample_questions.xml
+++ b/testapp/yaksh/docs/sample_questions.xml
diff --git a/testapp/yaksh_app/forms.py b/testapp/yaksh/forms.py
index 8a909f2..8878114 100644
--- a/testapp/yaksh_app/forms.py
+++ b/testapp/yaksh/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from testapp.yaksh_app.models import Profile, Quiz, Question, TestCase
+from testapp.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_app/java_code_evaluator.py b/testapp/yaksh/java_code_evaluator.py
index 4367259..4367259 100644
--- a/testapp/yaksh_app/java_code_evaluator.py
+++ b/testapp/yaksh/java_code_evaluator.py
diff --git a/testapp/yaksh_app/java_files/main_array_sum.java b/testapp/yaksh/java_files/main_array_sum.java
index 5eae299..5eae299 100644
--- a/testapp/yaksh_app/java_files/main_array_sum.java
+++ b/testapp/yaksh/java_files/main_array_sum.java
diff --git a/testapp/yaksh_app/java_files/main_fact.java b/testapp/yaksh/java_files/main_fact.java
index 325dab6..325dab6 100644
--- a/testapp/yaksh_app/java_files/main_fact.java
+++ b/testapp/yaksh/java_files/main_fact.java
diff --git a/testapp/yaksh_app/java_files/main_great.java b/testapp/yaksh/java_files/main_great.java
index 4bfcb1f..4bfcb1f 100644
--- a/testapp/yaksh_app/java_files/main_great.java
+++ b/testapp/yaksh/java_files/main_great.java
diff --git a/testapp/yaksh_app/java_files/main_hello_name.java b/testapp/yaksh/java_files/main_hello_name.java
index 84bb282..84bb282 100644
--- a/testapp/yaksh_app/java_files/main_hello_name.java
+++ b/testapp/yaksh/java_files/main_hello_name.java
diff --git a/testapp/yaksh_app/java_files/main_lastDigit.java b/testapp/yaksh/java_files/main_lastDigit.java
index 05439e2..05439e2 100644
--- a/testapp/yaksh_app/java_files/main_lastDigit.java
+++ b/testapp/yaksh/java_files/main_lastDigit.java
diff --git a/testapp/yaksh_app/java_files/main_moreThan30.java b/testapp/yaksh/java_files/main_moreThan30.java
index 7da31cb..7da31cb 100644
--- a/testapp/yaksh_app/java_files/main_moreThan30.java
+++ b/testapp/yaksh/java_files/main_moreThan30.java
diff --git a/testapp/yaksh_app/java_files/main_palindrome.java b/testapp/yaksh/java_files/main_palindrome.java
index c0745f9..c0745f9 100644
--- a/testapp/yaksh_app/java_files/main_palindrome.java
+++ b/testapp/yaksh/java_files/main_palindrome.java
diff --git a/testapp/yaksh_app/java_files/main_square.java b/testapp/yaksh/java_files/main_square.java
index 5cb8c35..5cb8c35 100644
--- a/testapp/yaksh_app/java_files/main_square.java
+++ b/testapp/yaksh/java_files/main_square.java
diff --git a/testapp/yaksh_app/language_registry.py b/testapp/yaksh/language_registry.py
index 76a23d7..76a23d7 100644
--- a/testapp/yaksh_app/language_registry.py
+++ b/testapp/yaksh/language_registry.py
diff --git a/testapp/yaksh_app/management/__init__.py b/testapp/yaksh/management/__init__.py
index e69de29..e69de29 100644
--- a/testapp/yaksh_app/management/__init__.py
+++ b/testapp/yaksh/management/__init__.py
diff --git a/testapp/yaksh_app/management/commands/__init__.py b/testapp/yaksh/management/commands/__init__.py
index e69de29..e69de29 100644
--- a/testapp/yaksh_app/management/commands/__init__.py
+++ b/testapp/yaksh/management/commands/__init__.py
diff --git a/testapp/yaksh_app/management/commands/add_group.py b/testapp/yaksh/management/commands/add_group.py
index db0ebb6..03ef103 100644
--- a/testapp/yaksh_app/management/commands/add_group.py
+++ b/testapp/yaksh/management/commands/add_group.py
@@ -15,7 +15,7 @@ class Command(BaseCommand):
     help = 'Adds the moderator group'
 
     def handle(self, *args, **options):
-        app = 'yaksh_app'
+        app = 'yaksh'
         group = Group(name='moderator')
         try:
             group.save()
diff --git a/testapp/yaksh_app/management/commands/dump_user_data.py b/testapp/yaksh/management/commands/dump_user_data.py
index 2c1a108..302728e 100644
--- a/testapp/yaksh_app/management/commands/dump_user_data.py
+++ b/testapp/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_app.views import get_user_data
-from testapp.yaksh_app.models import User
+from testapp.yaksh.views import get_user_data
+from testapp.yaksh.models import User
 
 data_template = Template('''\
 ===============================================================================
diff --git a/testapp/yaksh_app/management/commands/load_exam.py b/testapp/yaksh/management/commands/load_exam.py
index 9163fdc..84bf762 100644
--- a/testapp/yaksh_app/management/commands/load_exam.py
+++ b/testapp/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_app.models import Question, Quiz
+from testapp.yaksh.models import Question, Quiz
 
 def clear_exam():
     """Deactivate all questions from the database."""
diff --git a/testapp/yaksh_app/management/commands/load_questions_xml.py b/testapp/yaksh/management/commands/load_questions_xml.py
index 7bde9e9..0109e40 100644
--- a/testapp/yaksh_app/management/commands/load_questions_xml.py
+++ b/testapp/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_app.models import Question
+from testapp.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_app/management/commands/results2csv.py b/testapp/yaksh/management/commands/results2csv.py
index c9b05ce..daf6eb9 100644
--- a/testapp/yaksh_app/management/commands/results2csv.py
+++ b/testapp/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_app.models import Quiz, QuestionPaper
+from testapp.yaksh.models import Quiz, QuestionPaper
 
 result_template = Template('''\
 "name","username","rollno","email","answered","total","attempts","position",\
diff --git a/testapp/yaksh_app/models.py b/testapp/yaksh/models.py
index 62ac9bc..62ac9bc 100644
--- a/testapp/yaksh_app/models.py
+++ b/testapp/yaksh/models.py
diff --git a/testapp/yaksh_app/output/README.txt b/testapp/yaksh/output/README.txt
index 3163ed4..3163ed4 100644
--- a/testapp/yaksh_app/output/README.txt
+++ b/testapp/yaksh/output/README.txt
diff --git a/testapp/yaksh_app/python_code_evaluator.py b/testapp/yaksh/python_code_evaluator.py
index 0c473cf..0c473cf 100644
--- a/testapp/yaksh_app/python_code_evaluator.py
+++ b/testapp/yaksh/python_code_evaluator.py
diff --git a/testapp/yaksh_app/scilab_code_evaluator.py b/testapp/yaksh/scilab_code_evaluator.py
index 392cd45..392cd45 100644
--- a/testapp/yaksh_app/scilab_code_evaluator.py
+++ b/testapp/yaksh/scilab_code_evaluator.py
diff --git a/testapp/yaksh_app/scilab_files/test_add.sce b/testapp/yaksh/scilab_files/test_add.sce
index a317cdb..a317cdb 100644
--- a/testapp/yaksh_app/scilab_files/test_add.sce
+++ b/testapp/yaksh/scilab_files/test_add.sce
diff --git a/testapp/yaksh_app/settings.py b/testapp/yaksh/settings.py
index 9039250..4b1828e 100644
--- a/testapp/yaksh_app/settings.py
+++ b/testapp/yaksh/settings.py
@@ -1,5 +1,5 @@
 """
-settings for yaksh_app app.
+settings for yaksh app.
 """
 # The ports the code server should run on.  This will run one separate
 # server for each port listed in the following list.
diff --git a/testapp/yaksh_app/static/yaksh_app/css/autotaggit.css b/testapp/yaksh/static/yaksh_app/css/autotaggit.css
index ed856ce..ed856ce 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/autotaggit.css
+++ b/testapp/yaksh/static/yaksh_app/css/autotaggit.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/base.css b/testapp/yaksh/static/yaksh_app/css/base.css
index 3570098..3570098 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/base.css
+++ b/testapp/yaksh/static/yaksh_app/css/base.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/gradeuser.css b/testapp/yaksh/static/yaksh_app/css/gradeuser.css
index 07b1079..07b1079 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/gradeuser.css
+++ b/testapp/yaksh/static/yaksh_app/css/gradeuser.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/login.css b/testapp/yaksh/static/yaksh_app/css/login.css
index a10cbaa..a10cbaa 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/login.css
+++ b/testapp/yaksh/static/yaksh_app/css/login.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/monitor.css b/testapp/yaksh/static/yaksh_app/css/monitor.css
index b16c8b3..b16c8b3 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/monitor.css
+++ b/testapp/yaksh/static/yaksh_app/css/monitor.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/question.css b/testapp/yaksh/static/yaksh_app/css/question.css
index 4bf5913..4bf5913 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/question.css
+++ b/testapp/yaksh/static/yaksh_app/css/question.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/question_paper_creation.css b/testapp/yaksh/static/yaksh_app/css/question_paper_creation.css
index c915320..c915320 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/question_paper_creation.css
+++ b/testapp/yaksh/static/yaksh_app/css/question_paper_creation.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/question_quiz.css b/testapp/yaksh/static/yaksh_app/css/question_quiz.css
index ee249d4..ee249d4 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/question_quiz.css
+++ b/testapp/yaksh/static/yaksh_app/css/question_quiz.css
diff --git a/testapp/yaksh_app/static/yaksh_app/css/showusers.css b/testapp/yaksh/static/yaksh_app/css/showusers.css
index 66a3746..66a3746 100644
--- a/testapp/yaksh_app/static/yaksh_app/css/showusers.css
+++ b/testapp/yaksh/static/yaksh_app/css/showusers.css
diff --git a/testapp/yaksh_app/static/yaksh_app/js/add_question.js b/testapp/yaksh/static/yaksh_app/js/add_question.js
index 946c139..946c139 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/add_question.js
+++ b/testapp/yaksh/static/yaksh_app/js/add_question.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/add_questionpaper.js b/testapp/yaksh/static/yaksh_app/js/add_questionpaper.js
index 6185dd5..6185dd5 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/add_questionpaper.js
+++ b/testapp/yaksh/static/yaksh_app/js/add_questionpaper.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/add_quiz.js b/testapp/yaksh/static/yaksh_app/js/add_quiz.js
index 184881c..184881c 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/add_quiz.js
+++ b/testapp/yaksh/static/yaksh_app/js/add_quiz.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/bootstrap-modal.js b/testapp/yaksh/static/yaksh_app/js/bootstrap-modal.js
index b328217..b328217 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/bootstrap-modal.js
+++ b/testapp/yaksh/static/yaksh_app/js/bootstrap-modal.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/bootstrap-tabs.js b/testapp/yaksh/static/yaksh_app/js/bootstrap-tabs.js
index a3c7ee1..a3c7ee1 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/bootstrap-tabs.js
+++ b/testapp/yaksh/static/yaksh_app/js/bootstrap-tabs.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/edit_question.js b/testapp/yaksh/static/yaksh_app/js/edit_question.js
index 7a0f56d..7a0f56d 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/edit_question.js
+++ b/testapp/yaksh/static/yaksh_app/js/edit_question.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/edit_quiz.js b/testapp/yaksh/static/yaksh_app/js/edit_quiz.js
index ce6dac7..ce6dac7 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/edit_quiz.js
+++ b/testapp/yaksh/static/yaksh_app/js/edit_quiz.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/jquery-1.4.2.min.js b/testapp/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js
index 48a88b8..48a88b8 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/jquery-1.4.2.min.js
+++ b/testapp/yaksh/static/yaksh_app/js/jquery-1.4.2.min.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/min.js b/testapp/yaksh/static/yaksh_app/js/min.js
index b1ae21d..b1ae21d 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/min.js
+++ b/testapp/yaksh/static/yaksh_app/js/min.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/question.js b/testapp/yaksh/static/yaksh_app/js/question.js
index 75baf76..75baf76 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/question.js
+++ b/testapp/yaksh/static/yaksh_app/js/question.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/question_filter.js b/testapp/yaksh/static/yaksh_app/js/question_filter.js
index 065b06b..065b06b 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/question_filter.js
+++ b/testapp/yaksh/static/yaksh_app/js/question_filter.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/question_paper_creation.js b/testapp/yaksh/static/yaksh_app/js/question_paper_creation.js
index a144540..a144540 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/question_paper_creation.js
+++ b/testapp/yaksh/static/yaksh_app/js/question_paper_creation.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/show_question.js b/testapp/yaksh/static/yaksh_app/js/show_question.js
index e3ed1cc..e3ed1cc 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/show_question.js
+++ b/testapp/yaksh/static/yaksh_app/js/show_question.js
diff --git a/testapp/yaksh_app/static/yaksh_app/js/show_quiz.js b/testapp/yaksh/static/yaksh_app/js/show_quiz.js
index c58feaa..c58feaa 100644
--- a/testapp/yaksh_app/static/yaksh_app/js/show_quiz.js
+++ b/testapp/yaksh/static/yaksh_app/js/show_quiz.js
diff --git a/testapp/yaksh_app/templates/404.html b/testapp/yaksh/templates/404.html
index 7d33dd3..7d33dd3 100644
--- a/testapp/yaksh_app/templates/404.html
+++ b/testapp/yaksh/templates/404.html
diff --git a/testapp/yaksh_app/templates/500.html b/testapp/yaksh/templates/500.html
index d02721f..d02721f 100644
--- a/testapp/yaksh_app/templates/500.html
+++ b/testapp/yaksh/templates/500.html
diff --git a/testapp/yaksh_app/templates/base.html b/testapp/yaksh/templates/base.html
index 7b91978..5284a77 100644
--- a/testapp/yaksh_app/templates/base.html
+++ b/testapp/yaksh/templates/base.html
@@ -14,7 +14,7 @@
 	<meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" /> 
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/yaksh_app/templates/manage.html b/testapp/yaksh/templates/manage.html
index a5b4cf3..ca2ac65 100644
--- a/testapp/yaksh_app/templates/manage.html
+++ b/testapp/yaksh/templates/manage.html
@@ -11,8 +11,8 @@
 <meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" />
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/manage.css" type="text/css" />
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" />
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/manage.css" type="text/css" />
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/yaksh_app/templates/user.html b/testapp/yaksh/templates/user.html
index db2dc9e..00151d2 100644
--- a/testapp/yaksh_app/templates/user.html
+++ b/testapp/yaksh/templates/user.html
@@ -14,7 +14,7 @@
 	<meta name="author" content="">
    {% endblock %}
    
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
+   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" /> 
    {% block css %}
    {% endblock %}
 
diff --git a/testapp/yaksh_app/templates/yaksh_app/add_question.html b/testapp/yaksh/templates/yaksh/add_question.html
index 4b2d097..b896081 100644
--- a/testapp/yaksh_app/templates/yaksh_app/add_question.html
+++ b/testapp/yaksh/templates/yaksh/add_question.html
@@ -4,13 +4,13 @@
 {% block subtitle %}Add Question{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 {% endblock %}
 
 {% block script %}
-<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_question.js"></script>
+<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_question.js"></script>
 {% endblock %}
 
 {% block onload %} onload='javascript:textareaformat();' {% endblock %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html b/testapp/yaksh/templates/yaksh/add_questionpaper.html
index 049abbe..eaa96bc 100644
--- a/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html
+++ b/testapp/yaksh/templates/yaksh/add_questionpaper.html
@@ -4,12 +4,12 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
-<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+<script src="/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_questionpaper.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/add_quiz.html b/testapp/yaksh/templates/yaksh/add_quiz.html
index ded8e9b..e78023d 100644
--- a/testapp/yaksh_app/templates/yaksh_app/add_quiz.html
+++ b/testapp/yaksh/templates/yaksh/add_quiz.html
@@ -4,10 +4,10 @@
 {% block subtitle %}Add Quiz{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_quiz.js"></script>
 {% endblock %}
 {% block onload %} onload="javascript:test();"  {% endblock %}
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/ajax_marks.html b/testapp/yaksh/templates/yaksh/ajax_marks.html
index 716bb88..716bb88 100644
--- a/testapp/yaksh_app/templates/yaksh_app/ajax_marks.html
+++ b/testapp/yaksh/templates/yaksh/ajax_marks.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html b/testapp/yaksh/templates/yaksh/ajax_question_filter.html
index 11bf660..11bf660 100644
--- a/testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html
+++ b/testapp/yaksh/templates/yaksh/ajax_question_filter.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/ajax_questions.html b/testapp/yaksh/templates/yaksh/ajax_questions.html
index e343f9b..e343f9b 100644
--- a/testapp/yaksh_app/templates/yaksh_app/ajax_questions.html
+++ b/testapp/yaksh/templates/yaksh/ajax_questions.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html b/testapp/yaksh/templates/yaksh/automatic_questionpaper.html
index f9c222a..b9a4ae0 100644
--- a/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html
+++ b/testapp/yaksh/templates/yaksh/automatic_questionpaper.html
@@ -4,8 +4,8 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 <style>
 select
 {
@@ -14,8 +14,8 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+<script src="/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_questionpaper.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/complete.html b/testapp/yaksh/templates/yaksh/complete.html
index 08abe76..08abe76 100644
--- a/testapp/yaksh_app/templates/yaksh_app/complete.html
+++ b/testapp/yaksh/templates/yaksh/complete.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html b/testapp/yaksh/templates/yaksh/design_questionpaper.html
index f999cb1..2aa169b 100644
--- a/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
+++ b/testapp/yaksh/templates/yaksh/design_questionpaper.html
@@ -3,10 +3,10 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/base.css" type="text/css" /> 
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/question_paper_creation.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/question_paper_creation.css" />
 <style>
 select
 {
@@ -15,12 +15,12 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-tabs.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/question_paper_creation.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-tabs.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_questionpaper.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/question_paper_creation.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-modal.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/edit_question.html b/testapp/yaksh/templates/yaksh/edit_question.html
index 7aad7de..9a66250 100644
--- a/testapp/yaksh_app/templates/yaksh_app/edit_question.html
+++ b/testapp/yaksh/templates/yaksh/edit_question.html
@@ -3,12 +3,12 @@
 {% block subtitle %}Edit Question{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/edit_question.js"></script>
-<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/edit_question.js"></script>
+<script src="/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
 {% endblock %}
 
 {% block onload %} onload = 'javascript:textareaformat();' {% endblock %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/edit_quiz.html b/testapp/yaksh/templates/yaksh/edit_quiz.html
index c8a36e7..fb7df93 100644
--- a/testapp/yaksh_app/templates/yaksh_app/edit_quiz.html
+++ b/testapp/yaksh/templates/yaksh/edit_quiz.html
@@ -4,11 +4,11 @@
 {% block subtitle %}Edit Quiz(zes){% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/edit_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/edit_quiz.js"></script>
 {% endblock %}
 
 {% block onload %} onload = 'javascript:form_load();' {% endblock %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/editquestionpaper.html b/testapp/yaksh/templates/yaksh/editquestionpaper.html
index 90038b4..2b7b835 100644
--- a/testapp/yaksh_app/templates/yaksh_app/editquestionpaper.html
+++ b/testapp/yaksh/templates/yaksh/editquestionpaper.html
@@ -4,7 +4,7 @@
 {% block subtitle %}Questions in "{{ papers.quiz.description }}"{% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/show_question.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/grade_user.html b/testapp/yaksh/templates/yaksh/grade_user.html
index 1447337..8c094a7 100644
--- a/testapp/yaksh_app/templates/yaksh_app/grade_user.html
+++ b/testapp/yaksh/templates/yaksh/grade_user.html
@@ -5,11 +5,11 @@
 {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %}
  
 {% block css %}
-	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/gradeuser.css" type="text/css" /> 
+	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/gradeuser.css" type="text/css" /> 
 {% endblock %}
 
 {% block script %}
-<script src= "{{ URL_ROOT }}/static/yaksh_app/js/edit_question.js"></script>
+<script src= "{{ URL_ROOT }}/static/yaksh/js/edit_question.js"></script>
 {% endblock %}
 {% block manage %}
 
diff --git a/testapp/yaksh_app/templates/yaksh_app/intro.html b/testapp/yaksh/templates/yaksh/intro.html
index 9c5c14d..9c5c14d 100644
--- a/testapp/yaksh_app/templates/yaksh_app/intro.html
+++ b/testapp/yaksh/templates/yaksh/intro.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/login.html b/testapp/yaksh/templates/yaksh/login.html
index 341d7a7..dfeac1e 100644
--- a/testapp/yaksh_app/templates/yaksh_app/login.html
+++ b/testapp/yaksh/templates/yaksh/login.html
@@ -4,7 +4,7 @@
 {% block pagetitle %} Online Test {% endblock %}
 {% block formtitle %}Login{% endblock %}
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/login.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/login.css" type="text/css" /> 
 {% endblock %}
 {% block content %}
 
diff --git a/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html b/testapp/yaksh/templates/yaksh/manual_questionpaper.html
index 9e2a082..86bfd67 100644
--- a/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
+++ b/testapp/yaksh/templates/yaksh/manual_questionpaper.html
@@ -4,8 +4,8 @@
 {% block subtitle %}Design Question Paper{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 <style>
 select
 {
@@ -14,8 +14,8 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_questionpaper.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/monitor.html b/testapp/yaksh/templates/yaksh/monitor.html
index 261dffd..52695cb 100644
--- a/testapp/yaksh_app/templates/yaksh_app/monitor.html
+++ b/testapp/yaksh/templates/yaksh/monitor.html
@@ -5,7 +5,7 @@
 {% block meta %} <meta http-equiv="refresh" content="30"/> {% endblock meta %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
 {% endblock %}
 {% block subtitle %}
   {% if not quizzes and not quiz %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/question.html b/testapp/yaksh/templates/yaksh/question.html
index 594693c..e532513 100644
--- a/testapp/yaksh_app/templates/yaksh_app/question.html
+++ b/testapp/yaksh/templates/yaksh/question.html
@@ -5,14 +5,14 @@
 {% block title %} Answer question {% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question.css" type="text/css" />
 
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/question.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-modal.js"></script>
 
 <script>
 var time_left = {{ time_left }} 
diff --git a/testapp/yaksh_app/templates/yaksh_app/quit.html b/testapp/yaksh/templates/yaksh/quit.html
index 91bce64..91bce64 100644
--- a/testapp/yaksh_app/templates/yaksh_app/quit.html
+++ b/testapp/yaksh/templates/yaksh/quit.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/quizlist.html b/testapp/yaksh/templates/yaksh/quizlist.html
index 9b1fd73..9b1fd73 100644
--- a/testapp/yaksh_app/templates/yaksh_app/quizlist.html
+++ b/testapp/yaksh/templates/yaksh/quizlist.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/quizzes_user.html b/testapp/yaksh/templates/yaksh/quizzes_user.html
index 94f9d0f..fbd50ce 100644
--- a/testapp/yaksh_app/templates/yaksh_app/quizzes_user.html
+++ b/testapp/yaksh/templates/yaksh/quizzes_user.html
@@ -4,12 +4,12 @@
 {% block subtitle %}Hello {{ user.first_name }}, welcome to your dashboard !{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-alert.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/quizzes_user.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-alert.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/quizzes_user.js"></script>
 {% endblock %}
 
 
diff --git a/testapp/yaksh_app/templates/yaksh_app/register.html b/testapp/yaksh/templates/yaksh/register.html
index 5ff79cc..5ff79cc 100644
--- a/testapp/yaksh_app/templates/yaksh_app/register.html
+++ b/testapp/yaksh/templates/yaksh/register.html
diff --git a/testapp/yaksh_app/templates/yaksh_app/results_user.html b/testapp/yaksh/templates/yaksh/results_user.html
index fa8284e..0f35c0d 100644
--- a/testapp/yaksh_app/templates/yaksh_app/results_user.html
+++ b/testapp/yaksh/templates/yaksh/results_user.html
@@ -4,7 +4,7 @@
 {% block subtitle %}Results{% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/show_quiz.html b/testapp/yaksh/templates/yaksh/show_quiz.html
index a3c1c44..2cd4e11 100644
--- a/testapp/yaksh_app/templates/yaksh_app/show_quiz.html
+++ b/testapp/yaksh/templates/yaksh/show_quiz.html
@@ -3,7 +3,7 @@
 {% block title %} Quiz List {% endblock title %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/show_quiz.js"></script>
 {% endblock %}
 
 {% block subtitle %} Quiz List {% endblock %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/showquestionpapers.html b/testapp/yaksh/templates/yaksh/showquestionpapers.html
index 2a04717..e705ce7 100644
--- a/testapp/yaksh_app/templates/yaksh_app/showquestionpapers.html
+++ b/testapp/yaksh/templates/yaksh/showquestionpapers.html
@@ -4,7 +4,7 @@
 {% block subtitle %}List of Question Papers {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/show_question.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/showquestions.html b/testapp/yaksh/templates/yaksh/showquestions.html
index 0c8f9a4..6222d6d 100644
--- a/testapp/yaksh_app/templates/yaksh_app/showquestions.html
+++ b/testapp/yaksh/templates/yaksh/showquestions.html
@@ -4,9 +4,9 @@
 {% block subtitle %}List of Questions {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/min.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh_app/js/question_filter.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/min.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/show_question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/question_filter.js"></script>
 {% endblock %}
 
 {% block manage %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/showusers.html b/testapp/yaksh/templates/yaksh/showusers.html
index 7b2bb6d..ae91076 100644
--- a/testapp/yaksh_app/templates/yaksh_app/showusers.html
+++ b/testapp/yaksh/templates/yaksh/showusers.html
@@ -6,7 +6,7 @@ List of Users
 {% endblock %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh_app/css/showusers.css" type="text/css" /> 
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/showusers.css" type="text/css" /> 
 {% endblock css %}
 
 
diff --git a/testapp/yaksh_app/templates/yaksh_app/user_data.html b/testapp/yaksh/templates/yaksh/user_data.html
index 61a3a97..61a3a97 100644
--- a/testapp/yaksh_app/templates/yaksh_app/user_data.html
+++ b/testapp/yaksh/templates/yaksh/user_data.html
diff --git a/testapp/yaksh_app/tests.py b/testapp/yaksh/tests.py
index fd6f6a9..f1587b7 100644
--- a/testapp/yaksh_app/tests.py
+++ b/testapp/yaksh/tests.py
@@ -1,5 +1,5 @@
 from django.utils import unittest
-from testapp.yaksh_app.models import User, Profile, Question, Quiz, QuestionPaper,\
+from testapp.yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\
     QuestionSet, AnswerPaper, Answer, TestCase
 import datetime, json
 
diff --git a/testapp/yaksh_app/urls.py b/testapp/yaksh/urls.py
index d096a61..11e5965 100644
--- a/testapp/yaksh_app/urls.py
+++ b/testapp/yaksh/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 
-urlpatterns = patterns('testapp.yaksh_app.views',
+urlpatterns = patterns('testapp.yaksh.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
     url(r'^quizzes/$', 'quizlist_user'),
diff --git a/testapp/yaksh_app/views.py b/testapp/yaksh/views.py
index e6aabc4..d4476b7 100644
--- a/testapp/yaksh_app/views.py
+++ b/testapp/yaksh/views.py
@@ -16,14 +16,14 @@ from taggit.models import Tag
 from itertools import chain
 import json
 # Local imports.
-from testapp.yaksh_app.models import Quiz, Question, QuestionPaper, QuestionSet
-from testapp.yaksh_app.models import Profile, Answer, AnswerPaper, User, TestCase
-from testapp.yaksh_app.forms import UserRegisterForm, UserLoginForm, QuizForm,\
+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,\
                 QuestionForm, RandomQuestionForm, TestCaseFormSet,\
                 QuestionFilterForm
-from testapp.yaksh_app.xmlrpc_clients import code_server
+from testapp.yaksh.xmlrpc_clients import code_server
 from settings import URL_ROOT
-from testapp.yaksh_app.models import AssignmentUpload
+from testapp.yaksh.models import AssignmentUpload
 
 # The directory where user data can be saved.
 OUTPUT_DIR = abspath(join(dirname(__file__), 'output'))
@@ -128,11 +128,11 @@ def user_register(request):
             login(request, new_user)
             return my_redirect("/exam/start/")
         else:
-            return my_render_to_response('yaksh_app/register.html', {'form': form},
+            return my_render_to_response('yaksh/register.html', {'form': form},
                                          context_instance=ci)
     else:
         form = UserRegisterForm()
-        return my_render_to_response('yaksh_app/register.html', {'form': form},
+        return my_render_to_response('yaksh/register.html', {'form': form},
                                       context_instance=ci)
 
 
@@ -162,7 +162,7 @@ def quizlist_user(request):
                 'unexpired_quizzes': unexpired_quizzes
             }
 
-    return my_render_to_response("yaksh_app/quizzes_user.html", context)
+    return my_render_to_response("yaksh/quizzes_user.html", context)
 
 
 def intro(request, questionpaper_id):
@@ -218,7 +218,7 @@ def intro(request, questionpaper_id):
                             'disable_quiz_time': quiz_disable_time,
                             'quiz_expired': quiz_expired
                         }
-                return my_render_to_response('yaksh_app/intro.html', context,
+                return my_render_to_response('yaksh/intro.html', context,
                                              context_instance=ci)
         else:
             return my_redirect("/exam/quizzes/")
@@ -231,7 +231,7 @@ def intro(request, questionpaper_id):
                     'disable_quiz_time': quiz_disable_time,
                     'quiz_expired': quiz_expired
                 }
-        return my_render_to_response('yaksh_app/intro.html', context,
+        return my_render_to_response('yaksh/intro.html', context,
                                      context_instance=ci)
 
 
@@ -267,7 +267,7 @@ def results_user(request):
                max_marks, percentage
         quiz_marks.append(temp)
     context = {'papers': quiz_marks}
-    return my_render_to_response("yaksh_app/results_user.html", context)
+    return my_render_to_response("yaksh/results_user.html", context)
 
 
 def edit_quiz(request):
@@ -375,14 +375,14 @@ def add_question(request, question_id=None):
                     if test_case_formset.is_valid():
                         test_case_formset.save()
                     else:
-                        return my_render_to_response('yaksh_app/add_question.html',
+                        return my_render_to_response('yaksh/add_question.html',
                                                      {'form': form,
                                                      'formset': test_case_formset},
                                                      context_instance=ci)
 
                     return my_redirect("/exam/manage/questions")
 
-                return my_render_to_response('yaksh_app/add_question.html',
+                return my_render_to_response('yaksh/add_question.html',
                                              {'form': form,
                                              'formset': test_case_formset},
                                              context_instance=ci)
@@ -416,21 +416,21 @@ def add_question(request, question_id=None):
                         for i in test_case_instance:
                             i.save()
                     else:
-                        return my_render_to_response('yaksh_app/add_question.html',
+                        return my_render_to_response('yaksh/add_question.html',
                                                      {'form': form,
                                                      'formset': test_case_formset},
                                                      context_instance=ci)
 
 
                     return my_redirect("/exam/manage/questions")
-                return my_render_to_response('yaksh_app/add_question.html',
+                return my_render_to_response('yaksh/add_question.html',
                                              {'form': form,
                                              'formset': test_case_formset},
                                              context_instance=ci)
 
         else:
             test_case_formset = add_or_delete_test_form(request.POST, form.save(commit=False))
-            return my_render_to_response('yaksh_app/add_question.html',
+            return my_render_to_response('yaksh/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -440,7 +440,7 @@ def add_question(request, question_id=None):
         if question_id is None:
             form = QuestionForm()
             test_case_formset = TestCaseFormSet(prefix='test', instance=Question())
-            return my_render_to_response('yaksh_app/add_question.html',
+            return my_render_to_response('yaksh/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -469,7 +469,7 @@ def add_question(request, question_id=None):
             test_case_formset = TestCaseFormSet(prefix='test', 
                                                     instance=d)
 
-            return my_render_to_response('yaksh_app/add_question.html',
+            return my_render_to_response('yaksh/add_question.html',
                                          {'form': form,
                                          'formset': test_case_formset},
                                          context_instance=ci)
@@ -511,13 +511,13 @@ def add_quiz(request, quiz_id=None):
                 quiz = Quiz.objects.get(id=quiz_id)
                 return my_redirect("/exam/manage/showquiz")
         else:
-            return my_render_to_response('yaksh_app/add_quiz.html',
+            return my_render_to_response('yaksh/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
     else:
         if quiz_id is None:
             form = QuizForm()
-            return my_render_to_response('yaksh_app/add_quiz.html',
+            return my_render_to_response('yaksh/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
         else:
@@ -535,7 +535,7 @@ def add_quiz(request, quiz_id=None):
             form.initial['prerequisite'] = d.prerequisite_id
             form.initial['attempts_allowed'] = d.attempts_allowed
             form.initial['time_between_attempts'] = d.time_between_attempts
-            return my_render_to_response('yaksh_app/add_quiz.html',
+            return my_render_to_response('yaksh/add_quiz.html',
                                          {'form': form},
                                          context_instance=ci)
 
@@ -557,19 +557,19 @@ def show_all_questionpapers(request, questionpaper_id=None):
             q_paper.questions.remove(Question.objects.get(id=i))
         question_paper = QuestionPaper.objects.all()
         context = {'papers': question_paper}
-        return my_render_to_response('yaksh_app/showquestionpapers.html', context,
+        return my_render_to_response('yaksh/showquestionpapers.html', context,
                                      context_instance=ci)
     if questionpaper_id is None:
         qu_papers = QuestionPaper.objects.all()
         context = {'papers': qu_papers}
-        return my_render_to_response('yaksh_app/showquestionpapers.html', context,
+        return my_render_to_response('yaksh/showquestionpapers.html', context,
                                      context_instance=ci)
     else:
         qu_papers = QuestionPaper.objects.get(id=questionpaper_id)
         quiz = qu_papers.quiz
         questions = qu_papers.questions.all()
         context = {'papers': {'quiz': quiz, 'questions': questions}}
-        return my_render_to_response('yaksh_app/editquestionpaper.html', context,
+        return my_render_to_response('yaksh/editquestionpaper.html', context,
                                      context_instance=ci)
 
 
@@ -615,12 +615,12 @@ def automatic_questionpaper(request, questionpaper_id=None):
                                     'tags': tags,
                                     'msg': msg}}
                 return my_render_to_response(
-                    'yaksh_app/automatic_questionpaper.html', context,
+                    'yaksh/automatic_questionpaper.html', context,
                     context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('yaksh_app/automatic_questionpaper.html',
+            return my_render_to_response('yaksh/automatic_questionpaper.html',
                                          context, context_instance=ci)
 
     else:
@@ -637,7 +637,7 @@ def automatic_questionpaper(request, questionpaper_id=None):
                 for quest in questions:
                     q = Question.objects.get(id=quest)
                     quest_paper.questions.add(q)
-                return my_redirect('/yaksh_app/manage/showquiz')
+                return my_redirect('/yaksh/manage/showquiz')
             else:
                 no_questions = int(request.POST.get('num_questions'))
                 fetched_questions = fetch_questions(request)
@@ -655,12 +655,12 @@ def automatic_questionpaper(request, questionpaper_id=None):
                                     'tags': tags,
                                     'msg': msg}}
                 return my_render_to_response(
-                    'yaksh_app/automatic_questionpaper.html', context,
+                    'yaksh/automatic_questionpaper.html', context,
                     context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('yaksh_app/automatic_questionpaper.html',
+            return my_render_to_response('yaksh/automatic_questionpaper.html',
                                          context, context_instance=ci)
 
 
@@ -696,13 +696,13 @@ def manual_questionpaper(request, questionpaper_id=None):
                 tags = Tag.objects.all()
                 context = {'data': {'questions': fetched_questions,
                                     'tags': tags, 'msg': msg}}
-                return my_render_to_response('yaksh_app/manual_questionpaper.html',
+                return my_render_to_response('yaksh/manual_questionpaper.html',
                                              context,
                                              context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('yaksh_app/manual_questionpaper.html',
+            return my_render_to_response('yaksh/manual_questionpaper.html',
                                          context, context_instance=ci)
 
     else:
@@ -729,13 +729,13 @@ def manual_questionpaper(request, questionpaper_id=None):
                 tags = Tag.objects.all()
                 context = {'data': {'questions': fetched_questions,
                                     'tags': tags, 'msg': msg}}
-                return my_render_to_response('yaksh_app/manual_questionpaper.html',
+                return my_render_to_response('yaksh/manual_questionpaper.html',
                                              context,
                                              context_instance=ci)
         else:
             tags = Tag.objects.all()
             context = {'data': {'tags': tags}}
-            return my_render_to_response('yaksh_app/manual_questionpaper.html',
+            return my_render_to_response('yaksh/manual_questionpaper.html',
                                          context, context_instance=ci)
 
 
@@ -779,12 +779,12 @@ def user_login(request):
             return my_redirect('/exam/login/')
         else:
             context = {"form": form}
-            return my_render_to_response('yaksh_app/login.html', context,
+            return my_render_to_response('yaksh/login.html', context,
                                          context_instance=ci)
     else:
         form = UserLoginForm()
         context = {"form": form}
-        return my_render_to_response('yaksh_app/login.html', context,
+        return my_render_to_response('yaksh/login.html', context,
                                      context_instance=ci)
 
 
@@ -886,7 +886,7 @@ def question(request, q_id, attempt_num, questionpaper_id, success_msg=None):
         if skipped_answer:
             context['last_attempt'] = skipped_answer[0].answer
     ci = RequestContext(request)
-    return my_render_to_response('yaksh_app/question.html', context,
+    return my_render_to_response('yaksh/question.html', context,
                                  context_instance=ci)
 
 
@@ -1019,7 +1019,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                    'to_attempt': to_attempt, 'submitted': submitted}
         ci = RequestContext(request)
 
-        return my_render_to_response('yaksh_app/question.html', context,
+        return my_render_to_response('yaksh/question.html', context,
                                      context_instance=ci)
     else:
         if time_left <= 0:
@@ -1037,7 +1037,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                        'to_attempt': to_attempt, 'submitted': submitted}
             ci = RequestContext(request)
 
-            return my_render_to_response('yaksh_app/question.html', context,
+            return my_render_to_response('yaksh/question.html', context,
                                          context_instance=ci)
         else:
             next_q = paper.completed_question(question.id)
@@ -1105,7 +1105,7 @@ def quit(request, attempt_num=None, questionpaper_id=None):
     context = {'id': questionpaper_id, 'attempt_num': attempt_num,
                  'unattempted': unattempted_questions,
                  'submitted': submitted_questions}
-    return my_render_to_response('yaksh_app/quit.html', context,
+    return my_render_to_response('yaksh/quit.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1117,7 +1117,7 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None):
         logout(request)
         message = reason or "You are successfully logged out."
         context = {'message': message}
-        return my_render_to_response('yaksh_app/complete.html', context)
+        return my_render_to_response('yaksh/complete.html', context)
     else:
         unattempted_questions, submitted_questions = get_question_labels(request,
                                                      attempt_num, questionpaper_id)
@@ -1139,13 +1139,13 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None):
                        Thank You !",
                        'unattempted': unattempted_questions,
                        'submitted': submitted_questions}
-            return my_render_to_response('yaksh_app/complete.html', context)
+            return my_render_to_response('yaksh/complete.html', context)
         else:
             message = reason or "You are successfully logged out"
             context = {'message':  message,
                          'unattempted': unattempted_questions,
                          'submitted': submitted_questions}
-            return my_render_to_response('yaksh_app/complete.html', context)
+            return my_render_to_response('yaksh/complete.html', context)
     no = False
     message = reason or 'The quiz has been completed. Thank you.'
     if user.groups.filter(name='moderator').count() > 0:
@@ -1175,7 +1175,7 @@ def monitor(request, questionpaper_id=None):
         context = {'papers': [],
                    'quiz': None,
                    'quizzes': q_paper}
-        return my_render_to_response('yaksh_app/monitor.html', context,
+        return my_render_to_response('yaksh/monitor.html', context,
                                      context_instance=ci)
     # quiz_id is not None.
     try:
@@ -1188,7 +1188,7 @@ def monitor(request, questionpaper_id=None):
             total=Sum('answers__marks')).order_by('-total')
 
     context = {'papers': papers, 'quiz': q_paper, 'quizzes': None}
-    return my_render_to_response('yaksh_app/monitor.html', context,
+    return my_render_to_response('yaksh/monitor.html', context,
                                  context_instance=ci)
 
 
@@ -1220,7 +1220,7 @@ def show_all_users(request):
     user = User.objects.filter(username__contains="")
     questionpaper = AnswerPaper.objects.all()
     context = {'question': questionpaper}
-    return my_render_to_response('yaksh_app/showusers.html', context,
+    return my_render_to_response('yaksh/showusers.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1241,7 +1241,7 @@ def show_all_quiz(request):
             context = {'papers': [],
                        'quiz': None,
                        'quizzes': quizzes}
-            return my_render_to_response('yaksh_app/show_quiz.html', context,
+            return my_render_to_response('yaksh/show_quiz.html', context,
                                          context_instance=ci)
         else:
             for i in data:
@@ -1250,7 +1250,7 @@ def show_all_quiz(request):
             context = {'papers': [],
                        'quiz': None,
                        'quizzes': quizzes}
-            return my_render_to_response('yaksh_app/show_quiz.html', context,
+            return my_render_to_response('yaksh/show_quiz.html', context,
                                          context_instance=ci)
 
     elif request.method == 'POST' and request.POST.get('edit') == 'edit':
@@ -1270,7 +1270,7 @@ def show_all_quiz(request):
             form.initial['language'] = d.language
             form.initial['prerequisite'] = d.prerequisite_id
             forms.append(form)
-        return my_render_to_response('yaksh_app/edit_quiz.html',
+        return my_render_to_response('yaksh/edit_quiz.html',
                                      {'forms': forms, 'data': data},
                                      context_instance=ci)
     else:
@@ -1278,7 +1278,7 @@ def show_all_quiz(request):
         context = {'papers': [],
                    'quiz': None,
                    'quizzes': quizzes}
-        return my_render_to_response('yaksh_app/show_quiz.html', context,
+        return my_render_to_response('yaksh/show_quiz.html', context,
                                      context_instance=ci)
 
 
@@ -1302,7 +1302,7 @@ def ajax_questions_filter(request):
 
     questions = list(Question.objects.filter(**filter_dict))
 
-    return my_render_to_response('yaksh_app/ajax_question_filter.html',
+    return my_render_to_response('yaksh/ajax_question_filter.html',
                                   {'questions': questions})
 
 
@@ -1324,7 +1324,7 @@ def show_all_questions(request):
                        'questions': questions,
                        'form': form
                        }
-            return my_render_to_response('yaksh_app/showquestions.html', context,
+            return my_render_to_response('yaksh/showquestions.html', context,
                                          context_instance=ci)
         else:
             for i in data:
@@ -1336,7 +1336,7 @@ def show_all_questions(request):
                        'questions': questions,
                        'form': form
                        }
-            return my_render_to_response('yaksh_app/showquestions.html', context,
+            return my_render_to_response('yaksh/showquestions.html', context,
                                          context_instance=ci)
     elif request.method == 'POST' and request.POST.get('edit') == 'edit':
         data = request.POST.getlist('question')
@@ -1369,7 +1369,7 @@ def show_all_questions(request):
             formsets.append(test_case_formset)
             data_list = zip(forms, formsets)
 
-        return my_render_to_response('yaksh_app/edit_question.html',
+        return my_render_to_response('yaksh/edit_question.html',
                                      {'data': data,
                                      'data_list': data_list},
                                      context_instance=ci)
@@ -1381,7 +1381,7 @@ def show_all_questions(request):
                    'questions': questions,
                    'form': form
                    }
-        return my_render_to_response('yaksh_app/showquestions.html', context,
+        return my_render_to_response('yaksh/showquestions.html', context,
                                      context_instance=ci)
 
 
@@ -1395,7 +1395,7 @@ def user_data(request, username):
     data = get_user_data(username)
 
     context = {'data': data}
-    return my_render_to_response('yaksh_app/user_data.html', context,
+    return my_render_to_response('yaksh/user_data.html', context,
                                  context_instance=RequestContext(request))
 
 
@@ -1422,11 +1422,11 @@ def grade_user(request, username):
             paper.save()
 
         context = {'data': data}
-        return my_render_to_response('yaksh_app/user_data.html', context,
+        return my_render_to_response('yaksh/user_data.html', context,
                                      context_instance=ci)
     else:
         context = {'data': data}
-        return my_render_to_response('yaksh_app/grade_user.html', context,
+        return my_render_to_response('yaksh/grade_user.html', context,
                                      context_instance=ci)
 
 
@@ -1439,7 +1439,7 @@ def ajax_questionpaper(request, query):
         question_type = request.POST.get('question_type')
         questions = Question.objects.filter(type=question_type)
         marks = questions.values_list('points').distinct()
-        return my_render_to_response('yaksh_app/ajax_marks.html', {'marks': marks})
+        return my_render_to_response('yaksh/ajax_marks.html', {'marks': marks})
     elif query == 'questions':
         question_type = request.POST['question_type']
         marks_selected = request.POST['marks']
@@ -1452,7 +1452,7 @@ def ajax_questionpaper(request, query):
                                             points=marks_selected))
         questions = [question for question in questions \
                 if not str(question.id) in question_list]
-        return my_render_to_response('yaksh_app/ajax_questions.html',
+        return my_render_to_response('yaksh/ajax_questions.html',
                               {'questions': questions})
 
 
@@ -1498,5 +1498,5 @@ def design_questionpaper(request):
     else:
         form = RandomQuestionForm()
         context = {'form': form}
-        return my_render_to_response('yaksh_app/design_questionpaper.html',
+        return my_render_to_response('yaksh/design_questionpaper.html',
                                      context, context_instance=ci)
diff --git a/testapp/yaksh_app/xmlrpc_clients.py b/testapp/yaksh/xmlrpc_clients.py
index 3a3c0c6..3a3c0c6 100644
--- a/testapp/yaksh_app/xmlrpc_clients.py
+++ b/testapp/yaksh/xmlrpc_clients.py