rearranged the package layout