packages rearranged
basic views