Modified package structure to make more sense.