diff --git a/python/pyspark/mllib/linalg/__init__.py b/python/pyspark/mllib/linalg/__init__.py
new file mode 100644
index 0000000000000..b173d61e16532
--- /dev/null
+++ b/python/pyspark/mllib/linalg/__init__.py
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""
+Python package for local and distributed linear algebra in mllib.
+"""
+
+from pyspark.mllib.linalg.local import *
+
+__all__ = ['Vector', 'DenseVector', 'SparseVector', 'Vectors',
+           'Matrix', 'DenseMatrix', 'SparseMatrix', 'Matrices',
+           '_convert_to_vector', 'VectorUDT', 'MatrixUDT']
diff --git a/python/pyspark/mllib/linalg.py b/python/pyspark/mllib/linalg/local.py
similarity index 99%
rename from python/pyspark/mllib/linalg.py
rename to python/pyspark/mllib/linalg/local.py
index 334dc8e38bb8f..4cbedbd4f76e2 100644
--- a/python/pyspark/mllib/linalg.py
+++ b/python/pyspark/mllib/linalg/local.py
@@ -42,7 +42,8 @@
 
 
 __all__ = ['Vector', 'DenseVector', 'SparseVector', 'Vectors',
-           'Matrix', 'DenseMatrix', 'SparseMatrix', 'Matrices']
+           'Matrix', 'DenseMatrix', 'SparseMatrix', 'Matrices',
+           '_convert_to_vector', 'VectorUDT', 'MatrixUDT']
 
 
 if sys.version_info[:2] == (2, 7):