new packge structure
fix sql clerical mistake