changed some package structure