Reorganise app/template