rearranging to allow to work with pip, and cleanup.