move to pip package structure