restructure
deletions (moved)
rename
give a __main__ so can be called as python -m cigar