Fixed import statements to be used from dist-packages