update for new package structure