Reorganizing into a python package