Work also with Python2
Renamed modules