cleanup package structure