Reorganized as package. New pip version