diff --git a/media/css/seahub.css b/media/css/seahub.css
index 1bf182270b..bfc225055b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -196,6 +196,9 @@ p {
 .icon-star {
     color:#505050;
 }
+.edit-icon {
+    cursor:pointer;
+}
 .op,
 .more {
     font-weight:normal;
@@ -958,6 +961,9 @@ textarea:-moz-placeholder {/* for FF */
     width:260px;
     margin-bottom:5px;
 }
+.input-area {
+    height:80px;
+}
 #repo-desc {
     height:70px;
 }
@@ -1289,17 +1295,24 @@ textarea:-moz-placeholder {/* for FF */
     display:block;
     padding:0 12px;
 }
-#mv-form {
+.file-choose-form {
     width:500px;
     padding:10px 20px;
 }
-#mv-dir-list {
+.file-tree-cont, .dir-tree-cont {
     padding:5px;
     height:280px;
     overflow:auto;
     border:1px solid #eee;
     margin:5px 0 10px;
 }
+.file-tree-cont .jstree-leaf a ins.jstree-icon {
+    background: transparent url('../img/file-icon-16.png') no-repeat left center;
+    vertical-align:top;
+}
+.file-tree-cont .jstree-leaf[repo_id] a ins.jstree-icon {
+    background:transparent url('../jstree_pre1.0_stable/themes/classic/d.png') no-repeat scroll -56px -36px;
+}
 #mv-dir-list .tri-bg {
     margin-right:20px;
     margin-bottom:3px;
diff --git a/media/img/file-icon-16.png b/media/img/file-icon-16.png
new file mode 100644
index 0000000000..9f39b0ee92
Binary files /dev/null and b/media/img/file-icon-16.png differ
diff --git a/seahub/group/templates/group/group_discuss.html b/seahub/group/templates/group/group_discuss.html
index 649911f9b0..1c200ff46a 100644
--- a/seahub/group/templates/group/group_discuss.html
+++ b/seahub/group/templates/group/group_discuss.html
@@ -15,6 +15,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Discussion" %}</li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
         {% endif %}
diff --git a/seahub/group/templates/group/group_info.html b/seahub/group/templates/group/group_info.html
index 97516dd473..39ac0ff662 100644
--- a/seahub/group/templates/group/group_info.html
+++ b/seahub/group/templates/group/group_info.html
@@ -16,6 +16,9 @@
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Libraries" %}</li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
         {% if is_staff %}
         <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
diff --git a/seahub/group/templates/group/group_info_for_pub.html b/seahub/group/templates/group/group_info_for_pub.html
index a92318a65f..444a3d4a28 100644
--- a/seahub/group/templates/group/group_info_for_pub.html
+++ b/seahub/group/templates/group/group_info_for_pub.html
@@ -16,6 +16,7 @@
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Libraries" %}</li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
     </ul>
 </div>
 
diff --git a/seahub/group/templates/group/group_manage.html b/seahub/group/templates/group/group_manage.html
index 2f7b19c275..31604f5eb6 100644
--- a/seahub/group/templates/group/group_manage.html
+++ b/seahub/group/templates/group/group_manage.html
@@ -14,6 +14,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Admin" %}</li>
     </ul>
@@ -36,7 +39,7 @@
     <h3 class="info-item-top">{% trans "Operations" %}</h3>
     <ul class="info-item-bottom op-list">
         <li><a id="group-dismiss" href="#" data-url="{% url 'group_dismiss' group.id %}">{% trans "Dismiss" %}</a></li>
-        {% if is_pub %}
+        {% if group.is_pub %}
         <li><a href="{% url 'group_revoke_pub' group.id %}">{% trans "Revoke Public" %}</a></li>
         {% else %}
         <li><a href="{% url 'group_make_pub' group.id %}">{% trans "Make Public" %}</a></li>
diff --git a/seahub/group/templates/group/group_members.html b/seahub/group/templates/group/group_members.html
index 56950a6c38..aeea973c49 100644
--- a/seahub/group/templates/group/group_members.html
+++ b/seahub/group/templates/group/group_members.html
@@ -16,6 +16,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Members" %}</li>
         {% if is_staff %}
         <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
diff --git a/seahub/group/templates/group/group_wiki.html b/seahub/group/templates/group/group_wiki.html
index 4599e850f8..4e24ba1781 100644
--- a/seahub/group/templates/group/group_wiki.html
+++ b/seahub/group/templates/group/group_wiki.html
@@ -16,6 +16,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
         {% endif %}
diff --git a/seahub/group/templates/group/group_wiki_pages.html b/seahub/group/templates/group/group_wiki_pages.html
index e5c4a486c4..01fdbe7d46 100644
--- a/seahub/group/templates/group/group_wiki_pages.html
+++ b/seahub/group/templates/group/group_wiki_pages.html
@@ -15,6 +15,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
+        {% if group.is_pub %}
+        <li class="tabnav-tab"><a href="{% url 'group_pubfiles' group.id %}">{% trans "Files" %}</a></li>
+        {% endif %}
         {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
         {% endif %}
diff --git a/seahub/group/urls.py b/seahub/group/urls.py
index 3fdc8c0ad8..d60cccbb1b 100644
--- a/seahub/group/urls.py
+++ b/seahub/group/urls.py
@@ -36,3 +36,17 @@ urlpatterns = patterns('',
     url(r'^attention/$', attention, name='group_attention'),
     url(r'^joinrequest/(?P<group_id>[\d]+)/$', group_joinrequest, name='group_joinrequest'),
 )
+
+import seahub.settings as settings
+
+if settings.ENABLE_PUBFILE:
+    from seahub_extra.pubfile.views import group_pubfiles, group_pubfile_add, group_pubfile_delete, group_pubfile_edit, group_pubfile_download
+
+    urlpatterns += patterns('',
+        url(r'^(?P<group_id>\d+)/files/$', group_pubfiles, name='group_pubfiles'),
+        url(r'^(?P<group_id>\d+)/file/add/$', group_pubfile_add, name='group_pubfile_add'),
+        url(r'^(?P<group_id>\d+)/file/(?P<file_id>\d+)/delete/$', group_pubfile_delete, name='group_pubfile_delete'),
+        url(r'^(?P<group_id>\d+)/file/(?P<file_id>\d+)/edit/$', group_pubfile_edit, name='group_pubfile_edit'),
+        url(r'^(?P<group_id>\d+)/file/(?P<file_id>\d+)/$', group_pubfile_download, name='group_pubfile_download'),
+    )
+
diff --git a/seahub/group/views.py b/seahub/group/views.py
index 25e6adac03..21519f83b7 100644
--- a/seahub/group/views.py
+++ b/seahub/group/views.py
@@ -84,9 +84,13 @@ def group_check(func):
         if not group:
             return HttpResponseRedirect(reverse('group_list', args=[]))
         group.is_staff = False
+        if PublicGroup.objects.filter(group_id=group.id):
+            group.is_pub = True
+        else:
+            group.is_pub = False
 
         if not request.user.is_authenticated():
-            if not PublicGroup.objects.filter(group_id=group_id_int):
+            if not group.is_pub:
                 return render_to_response('group/group_pubinfo.html', {
                         'group': group,
                         }, context_instance=RequestContext(request))
@@ -104,8 +108,7 @@ def group_check(func):
             group.view_perm = "sys_admin"
             return func(request, group, *args, **kwargs)
 
-        pub = PublicGroup.objects.filter(group_id=group_id_int)
-        if pub:
+        if group.is_pub:
             group.view_perm = "pub"
             return func(request, group, *args, **kwargs)
             
@@ -465,12 +468,6 @@ def group_info(request, group):
                                               request.user.username)
         cmt.tp = cmt.props.desc.split(' ')[0]
 
-    if PublicGroup.objects.filter(group_id=group.id):
-        group.is_pub = True
-    else:
-        group.is_pub = False
-
-
     return render_to_response("group/group_info.html", {
             "members": members,
             "repos": repos,
@@ -609,16 +606,15 @@ def group_manage(request, group_id):
     contacts = Contact.objects.filter(user_email=username)
 
     if PublicGroup.objects.filter(group_id=group.id):
-        is_pub = True
+        group.is_pub = True
     else:
-        is_pub = False
+        group.is_pub = False
 
     return render_to_response('group/group_manage.html', {
             'group' : group,
             'members': members_all,
             'admins': admins,
             'contacts': contacts,
-            'is_pub': is_pub,
             }, context_instance=RequestContext(request))
 
 @login_required
diff --git a/seahub/settings.py b/seahub/settings.py
index 407eed00a7..212839a231 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -169,6 +169,7 @@ INSTALLED_APPS = (
     'seahub.share',
 )
 
+
 AUTHENTICATION_BACKENDS = (
     'seahub.base.accounts.AuthBackend',
 )
@@ -326,6 +327,12 @@ LOGGING = {
 SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER = True # Whether to send email when a system staff adding new member.
 SEND_EMAIL_ON_RESETTING_USER_PASSWD = True # Whether to send email when a system staff resetting user's password.
 
+##########################
+# Settings for Extra App #
+##########################
+
+ENABLE_PUBFILE = False
+
 #####################
 # External settings #
 #####################
@@ -388,3 +395,4 @@ SEAFILE_VERSION = '1.6'
 # Put here after loading other settings files if `SITE_ROOT` is modified in
 # other settings files.
 LOGIN_URL = SITE_ROOT + 'accounts/login'
+
diff --git a/seahub/share/templates/repo/share_admin.html b/seahub/share/templates/repo/share_admin.html
index c5c678c394..26cbf260f4 100644
--- a/seahub/share/templates/repo/share_admin.html
+++ b/seahub/share/templates/repo/share_admin.html
@@ -40,7 +40,7 @@
         <td>
             <div class="share-permission">
                 <span class="share-permission-cur-value">{{ repo.share_permission }}</span>
-                <img src="{{MEDIA_URL}}img/edit_12.png" alt="{% trans "Edit"%} icon" title="{% trans "Edit"%}" class="share-permission-edit-icon vh" />
+                <img src="{{MEDIA_URL}}img/edit_12.png" alt="{% trans "Edit"%}" title="{% trans "Edit"%}" class="share-permission-edit-icon vh" />
             </div>
             <select name="permission" class="share-permission-select hide">
                 <option value="{{ repo.props.permission }}" selected="selected">{{ repo.share_permission }}</option>
diff --git a/seahub/templates/repo.html b/seahub/templates/repo.html
index 2ed22c3162..9c8c942a9b 100644
--- a/seahub/templates/repo.html
+++ b/seahub/templates/repo.html
@@ -312,10 +312,10 @@
         <button class="simplemodal-close">{% trans "Cancel"%}</button>
     </form>
 
-    <form id="mv-form" action="{{ SITE_ROOT }}file/move/" method="post" class="hide">{% csrf_token %}
+    <form id="mv-form" action="{{ SITE_ROOT }}file/move/" method="post" class="file-choose-form hide">{% csrf_token %}
         <h3 id="mv-hd"></h3>
         <h4 id="mv-detail"></h4>
-        <div id="mv-dir-list">
+        <div id="mv-dir-list" class="dir-tree-cont">
             <h5><span class="tri-bg tri-down-bg"></span>{% trans "Current Library"%}</h5>
             <div id="current-repo-dirs"></div>
             <h5><span class="tri-bg tri-right-bg"></span>{% trans "Other Libraries"%}</h5>
@@ -871,17 +871,17 @@ function renderDirTree(container, repo_data) {
             }
         })
         .bind('select_node.jstree', function(e, data) {
+            var path;
             var repo_id = data.rslt.obj.attr('repo_id') || data.inst._get_parent(data.rslt.obj).attr('repo_id');
-            $('input[name="dst_repo"]').attr('value', repo_id);
-            var path = data.inst.get_path(data.rslt.obj);
-            var mv_dst_path = '';
-            if (path.length == 1) {
-                mv_dst_path = '/';
+            var path_array = data.inst.get_path(data.rslt.obj);
+            if (path_array.length == 1) {
+                path = '/';
             } else {
-                path.shift();
-                mv_dst_path = '/' + path.join('/') + '/';
+                path_array.shift();
+                path = '/' + path_array.join('/') + '/';
             }
-            $('input[name="dst_path"]').attr('value', mv_dst_path);
+            $('input[name="dst_repo"]').val(repo_id);
+            $('input[name="dst_path"]').val(path);
         })
         .jstree({
             'json_data': {
@@ -896,7 +896,7 @@ function renderDirTree(container, repo_data) {
                             path.shift();
                             path = '/' + path.join('/') + '/';
                         }
-                        return '{{ SITE_ROOT }}file/move/get_subdir/?repo_id=' + e(repo_id) + '&path=' + e(path);
+                        return '{{ SITE_ROOT }}ajax/repo/' + repo_id + '/dir/?path=' + e(path);
                     }
                 }
             },
diff --git a/seahub/urls.py b/seahub/urls.py
index e533f8d329..713170bd8a 100644
--- a/seahub/urls.py
+++ b/seahub/urls.py
@@ -86,7 +86,8 @@ urlpatterns = patterns('',
     (r'^pdf_full_view/$', pdf_full_view),
     url(r'^i18n/$', i18n, name='i18n'),
     (r'^download/repo/$', repo_download),                       
-    (r'^file/move/get_subdir/$', get_subdir),                       
+    (r'^ajax/repo/(?P<repo_id>[-0-9a-f]{36})/dir/$', get_subdir),                       
+    (r'^ajax/repo/(?P<repo_id>[-0-9a-f]{36})/file/$', get_dirents),                       
     (r'^file/move/$', file_move),
     (r'^seafile_access_check/$', seafile_access_check),                       
     url(r'^org/remove/(?P<org_id>[\d]+)/$', org_remove, name="org_remove"),
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 5f4c4c7274..44d8b52871 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -407,8 +407,15 @@ def update_file_error(request, repo_id):
                 'err_msg': err_msg,
                 }, context_instance=RequestContext(request))
     
-def get_subdir(request):
-    repo_id = request.GET.get('repo_id', '')
+@login_required
+def get_subdir(request, repo_id):
+    '''
+        Get only subdirs in a dir for file tree
+    '''
+    user_perm = get_user_permission(request, repo_id)
+    if not user_perm:
+        return render_error(request)
+
     path = request.GET.get('path', '')
 
     if not (repo_id and path):
@@ -426,7 +433,7 @@ def get_subdir(request):
             continue
 
         dirent.has_subdir = False
-        path_ = os.path.join (path, dirent.obj_name)
+        path_ = os.path.join(path, dirent.obj_name)
         try:
             dirs_ = seafserv_threaded_rpc.list_dir_by_path(latest_commit.id, path_.encode('utf-8'))
         except SearpcError, e:
@@ -451,6 +458,42 @@ def get_subdir(request):
     return HttpResponse(json.dumps(subdirs),
                             content_type=content_type)
 
+@login_required
+def get_dirents(request, repo_id):
+    '''
+        Get dirents in a dir for file tree
+    '''
+    user_perm = get_user_permission(request, repo_id)
+    if not user_perm:
+        return render_error(request)
+
+    path = request.GET.get('path', '')
+
+    if not (repo_id and path):
+        return render_error(request)
+
+    latest_commit = get_commits(repo_id, 0, 1)[0]
+    try:
+        dirents = seafserv_threaded_rpc.list_dir_by_path(latest_commit.id, path.encode('utf-8'))
+    except SearpcError, e:
+        return render_error(request, e.msg)
+
+    dirent_list = []
+    for dirent in dirents:
+        if stat.S_ISDIR(dirent.props.mode):
+            subdir = {
+                'data': dirent.obj_name,
+                'attr': {'repo_id': repo_id },
+                'state': 'closed'
+            }
+            dirent_list.append(subdir)
+        else:
+            dirent_list.append(dirent.obj_name)
+
+    content_type = 'application/json; charset=utf-8'
+    return HttpResponse(json.dumps(dirent_list),
+                            content_type=content_type)
+
 @login_required
 def repo_history(request, repo_id):
     """