changed input package structure #195