Changed package hierarchy