cleanup package structure for python 3