reorganize and rename packages