diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f2e848
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+__pycache__/
diff --git a/bindings/python/Makefile b/bindings/python/Makefile
index 6c19954..2642eac 100644
--- a/bindings/python/Makefile
+++ b/bindings/python/Makefile
@@ -9,7 +9,7 @@
 
 include ../common/Makefile.common
 
-BINDING_MODULE=$(if $(filter osx-%,$(PLATFORM)),ufal_udpipe.so,$(call dynlib,ufal_udpipe))
+BINDING_MODULE=$(if $(filter osx-%,$(PLATFORM)),ufal/_udpipe.so,$(call dynlib,ufal/_udpipe))
 BINDING_C_FLAGS+=$(if $(PYTHON_INCLUDE),,$(error PYTHON_INCLUDE must be set to the directory containing Python.h))
 BINDING_C_FLAGS+=$(call include_dir,$(PYTHON_INCLUDE))
 BINDING_C_FLAGS+=$(if $(filter %-gcc %-clang,$(PLATFORM)),-w)
@@ -23,7 +23,7 @@ $(BINDING_MODULE): $(call dynobj,udpipe_python) $(BINDING_UDPIPE_OBJECTS)
 udpipe_python.cpp: udpipe_python.i ../common/udpipe.i
 	@$(call mkdir,ufal)
 	@$(call echo,>ufal/__init__.py)
-	swig $(SWIG_FLAGS) -python -outdir ufal -o $@ -interface ufal_udpipe -builtin $<
+	swig $(SWIG_FLAGS) -python -outdir ufal -o $@ -builtin $<
 
 .PHONY: clean
 clean:
diff --git a/bindings/python/udpipe_python.i b/bindings/python/udpipe_python.i
index 2f92f69..b037079 100644
--- a/bindings/python/udpipe_python.i
+++ b/bindings/python/udpipe_python.i
@@ -1,4 +1,4 @@
-%module udpipe
+%module(package="ufal") udpipe
 
 %begin %{
 #ifdef _WIN32
@@ -12,4 +12,8 @@
 #endif
 %}
 
+%pythonbegin %{
+# __version__ =
+%}
+
 %include "../common/udpipe.i"
diff --git a/doc/t2t_docsys/txt2tags.py b/doc/t2t_docsys/txt2tags.py
index 9017b0a..3eb3c96 100755
--- a/doc/t2t_docsys/txt2tags.py
+++ b/doc/t2t_docsys/txt2tags.py
@@ -2124,10 +2124,10 @@ def getRegexes():
 	bank['linkmark'] = re.compile(
 		r'\[(?P<label>%s|[^]]+) (?P<link>%s|%s|%s)\]'%(
 			patt_img, retxt_url, patt_email, retxt_url_local),
-		re.L+re.I)
+  re.I)
 
 	# Image
-	bank['img'] = re.compile(patt_img, re.L+re.I)
+	bank['img'] = re.compile(patt_img, re.I)
 
 	# Special things
 	bank['special'] = re.compile(r'^%!\s*')
diff --git a/releases/pypi/.gitignore b/releases/pypi/.gitignore
index 215d31b..c8f6493 100644
--- a/releases/pypi/.gitignore
+++ b/releases/pypi/.gitignore
@@ -1 +1,2 @@
-ufal.udpipe
+ufal.udpipe/
+README
diff --git a/releases/pypi/gen.sh b/releases/pypi/gen.sh
index 2390fed..f3f460a 100755
--- a/releases/pypi/gen.sh
+++ b/releases/pypi/gen.sh
@@ -25,6 +25,8 @@ cp -a ../../bindings/python/ufal $dir
 
 # Fill in version
 sed "s/^\\( *version *= *'\\)[^']*'/\\1$1'/" setup.py >$dir/setup.py
+sed "s/^# *__version__ *=.*$/__version__ = \"$1\"/" $dir/ufal/udpipe.py > $dir/ufal/udpipe.py.tmp
+mv $dir/ufal/udpipe.py.tmp $dir/ufal/udpipe.py
 
 # README file
 ./README.sh >$dir/README
diff --git a/releases/pypi/setup.py b/releases/pypi/setup.py
index c7a0f1f..ef72570 100644
--- a/releases/pypi/setup.py
+++ b/releases/pypi/setup.py
@@ -4,9 +4,11 @@
 with open('README') as file:
     readme = file.read()
 
+extra_link_args = []
 extra_compile_args = ['-std=c++11', '-fvisibility=hidden', '-w']
 if platform == "darwin":
     extra_compile_args += ['-stdlib=libc++']
+    extra_link_args += ['-stdlib=libc++']
 
 setup(
     name             = 'ufal.udpipe',
@@ -19,11 +21,12 @@
     license          = 'MPL 2.0',
     py_modules       = ['ufal.udpipe'],
     ext_modules      = [Extension(
-        'ufal_udpipe',
+        'ufal._udpipe',
         ['udpipe/udpipe.cpp', 'udpipe/udpipe_python.cpp'],
         language = 'c++',
         include_dirs = ['udpipe/include'],
-        extra_compile_args = extra_compile_args)],
+        extra_compile_args = extra_compile_args,
+        extra_link_args = extra_link_args)],
     classifiers = [
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
diff --git a/src/mi/guesser.cpp b/src/mi/guesser.cpp
index 3498969..c5ec846 100644
--- a/src/mi/guesser.cpp
+++ b/src/mi/guesser.cpp
@@ -8,10 +8,8 @@
 #include <boost/iterator/filter_iterator.hpp>
 
 
-namespace institute
-{
-  namespace mova
-  {
+namespace ufal {
+namespace udpipe {
     ///////////////////////////////////////////////////////////////////////////
     void Guesser::analyze(vector<tagged_lemma>& o_lemmas, const char* i_form_bytes)
     {
@@ -227,5 +225,5 @@ namespace institute
     {
       this->dictionary = dictionary;
     }
-  }
-}
+} // namespace udpipe
+} // namespace ufal
diff --git a/src/mi/guesser.h b/src/mi/guesser.h
index 6c4d59b..b11a64f 100644
--- a/src/mi/guesser.h
+++ b/src/mi/guesser.h
@@ -2,8 +2,6 @@
 // Created by Москалевський on 4/6/17.
 //
 
-#ifndef SRC_GUESSER_H
-#define SRC_GUESSER_H
 
 #include "utils/string_piece.h"
 #include "morphodita/morpho/morpho_dictionary.h"
@@ -14,20 +12,14 @@
 #include <iostream>
 #include <regex>
 
+namespace ufal {
+namespace udpipe {
+    using ufal::udpipe::morphodita::generic_lemma_addinfo;
+    using ufal::udpipe::morphodita::morpho_dictionary;
+    using ufal::udpipe::morphodita::tagged_lemma;
+    using namespace ufal::udpipe::utils;
 
-using ufal::udpipe::morphodita::generic_lemma_addinfo;
-using ufal::udpipe::morphodita::morpho_dictionary;
-using ufal::udpipe::morphodita::tagged_lemma;
-using namespace ufal::udpipe::utils;
-
-
-
-typedef morpho_dictionary<generic_lemma_addinfo> Dictionary;
-
-namespace institute
-{
-  namespace mova
-  {
+    typedef morpho_dictionary<generic_lemma_addinfo> Dictionary;
     struct TaggedLemma
     {
       string tag;
@@ -64,8 +56,5 @@ namespace institute
     private:
 
     };
-  }
-}
-
-
-#endif //SRC_GUESSER_H
+} // namespace udpipe
+} // namespace ufal
diff --git a/src/mi/static.cpp b/src/mi/static.cpp
index 3db1d16..e233f16 100644
--- a/src/mi/static.cpp
+++ b/src/mi/static.cpp
@@ -6,13 +6,12 @@
 #include <map>
 #include "static.h"
 
-using std::wstring;
 
-namespace institute
-{
-  namespace mova
-  {
+namespace ufal {
+namespace udpipe {
+  using std::wstring;
+
 //    const wregex INTJ_RE{boost::join(INTJ_RE_STRS, L"|")};
 
-  }
-}
\ No newline at end of file
+} // namespace udpipe
+} // namespace ufal
diff --git a/src/mi/static.h b/src/mi/static.h
index 8d33186..b0c2b46 100644
--- a/src/mi/static.h
+++ b/src/mi/static.h
@@ -2,23 +2,17 @@
 // Created by Москалевський on 4/10/17.
 //
 
-#ifndef SRC_STATIC_H
-#define SRC_STATIC_H
-
 #include <regex>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string.hpp>
 
-using std::wstring;
-using std::string;
-using std::wregex;
-using std::regex;
-using std::vector;
-
-namespace institute
-{
-  namespace mova
-  {
+namespace ufal {
+namespace udpipe {
+    using std::wstring;
+    using std::string;
+    using std::wregex;
+    using std::regex;
+    using std::vector;
 
     struct PrefixSpec
     {
@@ -865,7 +859,5 @@ namespace institute
         {L'0', L"двадцяти",    L"двадцять",  "~NUM~~Case=Loc|Number=Plur|NumType=Card"},
         {L'0', L"двадцятьох",  L"двадцять",  "~NUM~~Case=Loc|Number=Plur|NumType=Card"},
     };
-  }
-}
-
-#endif //SRC_STATIC_H
+} // namespace udpipe
+} // namespace ufal
diff --git a/src/morphodita/morpho/generic_morpho.h b/src/morphodita/morpho/generic_morpho.h
index 659a3ea..f2fdaaa 100644
--- a/src/morphodita/morpho/generic_morpho.h
+++ b/src/morphodita/morpho/generic_morpho.h
@@ -38,7 +38,7 @@ class generic_morpho : public morpho {
   unsigned version;
   morpho_dictionary<generic_lemma_addinfo> dictionary;
   unique_ptr<morpho_statistical_guesser> statistical_guesser;
-  mutable institute::mova::Guesser mi_guesser;
+  mutable ufal::udpipe::Guesser mi_guesser;
 
   string unknown_tag, number_tag, punctuation_tag, symbol_tag;
 };