bug fix
fixed package structure