fix compile error
update packages structure